final version
Merge branch 'master' of https://github.com/kclau301/CMPUT391Project