Edited "This may cause a merge conflict"
Merge branch 'master' of https://github.com/nzimmermann/Lab_3

Attempting to merge for step 27, pulling partners changes to my repo