Finished rest of Task 6
Fixed merge conflict: finished Task 5