added ostream operator to body
Merge branch 'master' of github.com:jonac/concprog_project