Gemfile.lock added to git
Merge branch 'master' of github.com:semiweb/arma