User and migration
Merge branch 'master' of https://github.com/carousel/larabal.com

Conflicts:
	app/routes.php