cpp, not ccp
Merge pull request #5 from artedeschi/master

cpp, not ccp
Merge pull request #2 from frc-team-3341/master

Adam's changes