sunday work
Merge branch 'master' of https://github.com/ryebread77/cis415project2
minor clean up