final submission for jeff shih
Merge branch 'master' of https://github.com/alpearce/cis191practice