Updating to use local database settings
Merge branch 'master' of github.com:jsundquist/midwestphp

Conflicts:
	includes/database.php
	layout/index.html.twig
Fixed the merge issue