some changes
Merge branch 'master' of https://github.com/tskeet/IFDM491BravoTeam