Fix to class 7 exercise 1
Trying to avoid merge conflict
Merge remote-tracking branch 'upstream/master'