database integration about
Merge branch 'master' of https://github.com/freshpotatoe/motherplate

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