cleaned up cout's
Merge branch 'master' of https://github.com/Group7-1project/Project.git