Adding Gem and rakefiles
Merge remote-tracking branch 'origin/master'
Modifying Gemfile