Removed database.yml
Merge branch 'master' of github.com:calblueprint/foodshift

Conflicts:
	config/database.yml