added new readme
resolved merge conflict