add Gemfile.lock. I'm not sure this is a good idea
new it wasn't
Merge branch 'master' of https://github.com/beefproject/beef
Merge branch 'master' of https://github.com/beefproject/beef
require version 5 of the twitter gem due to removal of Twitter.configure method
Merge pull request #946 from offensivecoder/update_twitter_require_version_5

Update twitter require version 5