#6 maybe done
Merge branch 'master' of github.com:whymenot/cs162_proj1