Added Ruby version to GemFile
Added Procfile for Heroku
Fixed local merge conflicts