fix merge conflict in gemfile
Added gemfile.lock
Removed Procfile
Added procile again
changed config.ru for heroku
fix gemfile rename conflict