merging
Merge branch 'master' of github.com:lukasstoecklein/SWEN301GroupProject