Updates from class the other day
Merge branch 'master' of https://github.com/spudmonkey/CISP-1020