stuff and things
Merge branch 'master' of https://github.com/lansdon/cpts422