renaming README so github will parse as markdown
Merge remote-tracking branch 'origin/master'