config/database.yml
Merge branch 'master' of github.com:fomenky/first_app