stoof
Merge branch 'master' of https://github.com/dkellycollins/CIS536_TermProject
fixed bugs