Work from class today
Merge branch 'gh-pages' of https://github.com/gdickman/CS121-Work into gh-pages