database config on remote and yml
gerge branch 'master' of github.com:landrywj/atlaswarner

Conflicts:
	config/database.yml