changed readme and notes
resolved merge conflict