added Gemfile.lock/took out of gitignore
Merge branch 'master' of https://github.com/bobolinks-2014/trek_tracker