Fixing the readme
Merge from master
Adding the Gemfile