added encoders
Merge branch 'andrew' of https://github.com/Sparx-Robotics-1126/2015Preseason into andrew

Conflicts:
	2015-Preseason/src/edu/wpi/first/wpilibj/templates/RobotTemplate.java