added punch spaghetti to shooter
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014 into test
Fixed Ben's compile errors
I can't fix this
Please fix this code. I give up
Merge branch 'master' into mergeTest

Conflicts:
	Shooter.cpp
	Shooter.h
	main.cpp
	ports.h
Ben code merge
Working Netcomz :D
Merge pull request #56 from ethanhuey/master

Puncher and Accelerometer code
Merge pull request #55 from Ahmad-Bamba/master

Tried to do netcom. Failed. Commented out as not to cause compile errors
Sensors obj name and Shooter uses existing shooter obj
Misc fixes to smooth joystick
Minor fixes in pneumatics
actually does compile now after the previous minor fixes
naming convention in smooth joystick
Minor shifter fixes
Minor EncodeDistance fixes
Some changes and fixes to DriveTrain
Minor fixes to Shooter, including pickup sequence
Minor fixes to Sensors, also does not need update helper