Redid exercise 4
Fixed exercise 4 merge conflict