first pass
Merge branch 'master' of https://github.com/altgilbers/comp112