Commented, that's all
Merge branch 'master' of https://github.com/nklose/CMPUT302.git