Added Gemfile.lock
Merge branch 'lee' into develop