first commit for p6
adding p5 changes?
Merge branch 'master' of github.com:nkatzman/eecs381