Update README.md
Merge pull request #3 from firekesti/more-conflicts

Update README.md