Add display and update shooter speed
Merge branch 'master' of https://github.com/HVA-FRC-3824/HVA_Robot_2013

Conflicts:
	PPC603gnu/Makefile
	Subsystems/Drivetrain.cpp~
	Subsystems/Pickup.cpp~
	Subsystems/Pickup.h~
Remove backup files