Merge
Merge branch 'master' of http://github.com/adairdavid/SENG403G1
Fixed minor bug
Merge branch 'master' of http://github.com/adairdavid/SENG403G1