A3 stuff
Merge branch 'master' of https://github.com/manderelee/csc373