Fix conflict.

Merge pull request laravel#2358 from JosephSilber/ignore-windows-thumbs

gitignore windows thumbnails

added note about expiry time on reminders.

added note about expiry time on reminders.

Added array validation language lines.

Merge pull request laravel#2095 from briankiewel/patch2

changed google font url to be protocol relative

Added "pretend" option to mail config.

Tweak welcome page.

Remove extra not_in.

update change log.