jI'm stupid...
yea ok i changed the wrong thing…
Merge branch 'master' of https://github.com/FRC-Team-1160/2014-Aerial-Assist

Conflicts:
	src/com/team1160/assistant/subsystems/Pickup.java