recovery after accidental deletion of database config file
Merge branch 'user-microposts' into develop

Accidental deletion of database.yml file.