blah
Merge branch 'master' of https://github.com/jault3/se2832-lab7
Merge branch 'master' of https://github.com/jault3/se2832-lab7.git
My tests & 2 bug fixes