Add database.yml to repo
Merge remote-tracking branch 'origin/robert'
Merge branch 'master' into robert
Merge branch 'robert' of github.com:starkindustries/leadersbook into robert

Conflicts:
	.gitignore