another home
home
home test
testing home
Merge branch 'dev' into staging

Conflicts:
	app/views/layouts/home.blade.php