Update README with link to travis ci
Update README with link to travis ci
Fix merge conflict