changed database.yml
Merge branch 'master' of github.com:jimmydavis/ship2ship_app