Copied over from private repo
Merge branch 'master' of github.com:bmaxwell921/ComS228