Bugfix #2
Merge branch 'fixed' of https://github.com/andpol/seng426 into fixed