update
Merge branch 'holy-test'
Merge branch 'master' of https://github.com/toxin20/laravel-test

Conflicts:
	app/config/app.php