updates app.rb in config and database.yaml for heroku launch
fixes merge conflicts
goes back to program before heroku modifications