Fixed Merge Errors
Merge branch 'master' of https://github.com/ht92/CPSC304