Added database.yml
Merge branch 'master' of https://github.com/noahpc/WhiteCollar

Conflicts:
	config/database.yml