Gemfile.lock should not be ignored, it's used for deployment (whenever we get to that step anyways)
making gemfile and gemfile.lock consistent
Merge pull request #10 from karenliu1/noj/gemlock

Noj/gemlock