XboxContoller
Git goofed, re-commiting
Nothing, really
Merge branch 'master' of https://github.com/WestervilleWildWarbots/master

Conflicts:
	MasterRobot/nbproject/project.xml
Some null pointer catching
Yo
Yo
Fixed CAN timeout by not having the camera monitor command running during teleop (it was overloading the CPU)
Nothing
Added Launchpad
Deleted a line or something
Ignore
Vision targeting works
Merged DSEIO because I accidentally fixed vision in DSEIO (I deleted the
DSEIO stuff)
Dont use
Merged Joel's vision things with my half done x-box things
Autonomous tweaking
Merge branch 'master' of https://github.com/WestervilleWildWarbots/master

Conflicts:
	MasterRobot/src/edu/wpi/first/wpilibj/templates/RobotTemplate.java
Working on switches.
Fiddling with autonomous