Initial commit and Update Gemfile.lock for Heroku
fixed gitignore conflict