initial commit
Update Gemfile.lock for Heroku
Merge branch 'release/beta-1.0'