fixed some errors
Merge branch 'master' of https://github.com/dsharps/cis192final