adding git ignore
adding git ignore again
checking in gemfile.lock
Merge branch 'master' of https://github.com/numnums/sleepy-retreat-7565