Fixing minor typo in README.md
Merge pull request #109 from kstark/patch-1

Fixing minor typo in README.md
removed newlines
fixed confligt
updated showdown to marked in list of tech
updated License h2