(Matt) Fixed the errors in compatibility for my camera class
Merge branch 'master' of https://github.com/TrojanRobotics/FRCTeam-2386-2013