Repaired Gemfile.lock for merge conflicts caused by reputation-system gem
Sorry for adding breaking changes. Lesson learned: do not commit and push after auto-merge. Clean merged files and check for conflicts.
Merge branch 'master' of https://github.com/nshah99/feedme