added master code
resolved merge conflict
added notes