changes to both
Merge branch 'master' of https://github.com/markc1995/CM1101