added gemfile.lock from master for easier merging