working on lab04
Merge branch 'master' of https://github.com/plusk01/cs124