Merge branch 'master' of github.com:usmanity/totals
gemfile.lock ignored