Simplify commit
Merge branch 'master' of https://github.com/mulias/csc207-hw4