Matt wrote some stuff
Merge branch 'master' of https://github.com/pwilkins05/CS246