Created environment variable to hide dev DB info
Merge branch 'master' of https://github.com/ColdConfetti/carify

Conflicts:
	config/database.yml
so confused