Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
Update .travis.yml
Update README.md
conflict fix