first commit
Merge branch 'master' of https://github.com/mcpartington/CS433

This needs to happen.