remove conflict markers. added rake to gemfile. using Ruby 2.1.0 wouldn't allow me to build without it
Merge pull request #48 from Derikulous/master

remove conflict markers. added rake to gemfile.