inte home
Merge branch 'master' of https://github.com/ericluong/voila

Conflicts:
	app/views/home.blade.php