typo and stuff
Merge branch 'master' of github.com:wilwong/csc309-v2