Solved a bug
Merge branch 'master' of github.com:drderkummer/Software-Engineering-Project
Fixed a bug