readded gemfile.lock
Merge branch 'master' of https://github.com/fredwangster/battlehack
Testing heroku deploy