Fixed more compile errors
Merge branch 'master' of https://github.com/sammy1991106/CSC443-A1