New README
Resolved readme.md conflict