fixed the conflict on Gemfile.lock
Merge branch 'master' of https://github.com/mem-comp4081-2014fall/mud
the Gemfile.lock had a conflict