Removes merge conflict markings at the bottom of README.rdoc
Adds ruby gem version badge link in README.rdoc
Forgot that Readme is in rdoc format
Merge pull request #14 from rbmrclo/master

Removes merge conflict markings at README.rdoc and adds ruby version badge link