Merge pull request #1 from xiazek/master

removed Gemfile.lock from repository and added it to .gitignore