working on stuff
Merge branch 'master' of https://github.com/bhanderson/cpts471