Converted README to .md - Updated README
Resolved conflict