something
solving my conflicts
Merge branch 'master' of https://github.com/drderkummer/Software-Engineering-Project
fixing earlier error