user
Merge branch 'master' of https://github.com/StephanusJeffry/frunk

Conflicts:
	app/storage/logs/laravel.log