Testing encoders
Merge branch 'camera' of https://github.com/Nashoba-Robotics/Nashoba-Robotics2014 into camera
Merge branch 'camera' into shooter

Conflicts:
	nbproject/private/private.xml
	src/edu/nr/main/Robot.java
Moving robot back