Added README
Resolved merge conflict