Merge pull request #26 from PurpleKangaroo/master

return message in CAH_Game
Changes to javadoc, just getting egit set up for me today in APCS
Merge pull request #292 from HoltMaki/master

small documentation changes