remove readme conflict file
Merge branch 'master' of github.com:merembablas/ayoapi