add heroku pg:psql --app cheap-eats HEROKU_POSTGRESQL_AMBER
Merge branch 'master' of github.com:naterex/cheapeats
fix merge conflict of seeds.rb