Remove merge conflict remnant from readme
Merge pull request #118 from terite/patch-1

Remove merge conflict remnant from readme