Delete database.yml so we can gitignore it
Ignore database config
Merge branch 'dev' of https://github.com/codeflash/codeflash into dev

Conflicts:
	config/database.yml