added info to README
resolved merge conflict in README