Deleted homeworks
Resolved merge conflict