merge
Merge branch 'master' of https://github.com/bcspragu/YourTeamPlusPlus
various comments