reinitialize
update gemfile and config for heroku
update config
configured for deployment
fix merge conflict