Added readme.md
Resolved merge conflicts