Merging the project code into the main branch

Justus Stephensrequested to merge
project into main

facepalm - I forgot to do this before turning the assignment in.

Merge request reports