Update

Conflicts:
	.gitignore
	app/storage/logs/laravel.log