Made changes to readme to have wiki link
Merged upstream's readme
Merge pull request #4 from dasarpmar-test/master

Removed ^M's at the end of lines in README.md