Fixed bugs.
Merge branch 'master' of https://github.com/Comput391-kchow3-bwcheung-yw2/C391Proj1