fixed download issue
Merge branch 'master' of https://github.com/werehyena/FRC830-2014

Conflicts:
	2014robot/PPC603gnu/BuiltinDefaultCode/Debug/BuiltinDefaultCode.out
	2014robot/PPC603gnu/BuiltinDefaultCode_partialImage/Debug/BuiltinDefaultCode_partialImage.o
	2014robot/PPC603gnu/BuiltinDefaultCode_partialImage/Debug/Objects/2014robot/AerialAssistRobot.o
	2014robot/PPC603gnu/BuiltinDefaultCode_partialImage/Debug/Objects/2014robot/Gamepad.o
fixed conflicts
added to winch function, now sets catapult to an angle
added to winch function, now sets catapult to an angle