did some things
Merge branch 'master' of https://github.com/kirvenjt/276Project