Encoders were added to Drivetrain.
Merge branch 'master' of https://github.com/discobots2587/disco-frc

Conflicts:
	2014-AerialAssist/AerialAssist/src/org/discobots/aerialassist/subsystems/Drivetrain.java
I added deadbands to tank and stick drive.