Updates from in class demo
Initial version
Merge branch 'master' of https://github.com/m0smith/cs1400.git