list was added
resolved merge conflict
added notes. completed coding