main stuff
Merge branch 'master' of https://github.com/nguyenti/csc207-hw4
some testing