Fixed 2013 PWMs took out magic numbers no winch release or no pick up
motor
Merge branch 'master' of https://github.com/Team2643/2014_robot_code

Conflicts:
	EncoderDrive.java