Update README.md
Merge pull request #57 from andrewtat/master

Update README.md
Resolve merge conflict for README.md
Resolve merge conflict for README.md
Resolve merge conflict for README.md