Edit gemfile source
Add Devise secret key
Heroku devise problem
Successful deploy
Fix merge conflict
Fix naming
Conclude merge