commented out some echo statements I wrote
cleanup of junk print statments
Merge branch 'master' of https://github.com/nadinebo/CPSC304
Merge
Merge branch 'master' of https://github.com/nadinebo/CPSC304
merge