SETUP: LARAVEL AUTHENTICATION SET UP
Merge origin/master

Conflicts:
	.gitignore