Added lab7
Resolved merge conflict for lab7