final homework commit
Merge branch 'master' of https://github.com/tim-steele/csc160-lab3