Minor change to War Class Diagram.
Merge branch 'master' of github.com:developer-foundry/cohortone
Merge branch 'master' of github.com:developer-foundry/cohortone
Adding back in some of Will's changes.
Merge branch 'master' of github.com:developer-foundry/cohortone