cleaned up printouts
pulling changes

Merge branch 'beta' of https://github.com/cmput291-project1/project2 into beta