I Added encoders to the DriveTrain and Catapult Subsystems and added a few comments.
Merge branch 'master' of https://github.com/SunnyBat/FrcAerialAssist

Conflicts:
	2014RobotCode/nbproject/private/private.xml