I made a few revisions after everyone left and found the error at line 93 of vision, the error is unrelated to the cc
ok
Merge branch 'devel' of https://github.com/Xefused/2815 into devel

Conflicts:
	2815Robot/src/edu/wpi/first/wpilibj/Vision.java