mer fix
Merge branch 'master' of https://github.com/LordCopper/OOAD2