Revert "Merge branch 'master' of https://github.com/AWDGroup/CMPT275-05"

This reverts commit 94dd879be0b053e1ff576852c590af0f6f43821f, reversing
changes made to f10ed45db3d4c8e44b19c5f3c1a395ebeb6d4e63.