hw4 p2,1
Merge branch 'master' of https://github.com/markalward/cs381.git