revert database.yml
modify gemfile
update Gemfile.lock
revert database.yml
modify application.rb
revert to env-error
Merge branch 'master' of heroku.com:mas-rails-tutorial