Working on part 4
Merge branch 'master' of github.com:rdhead/CISP-1020-Term-Project