Finish lab 4
Merge branch 'master' of https://github.com/illioo/cs133p