Merge branch 'master' of https://github.com/ethanhuey/612-2014

pls
Conflicts:
	Drivetrain-test.h
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014
Merge branch 'master' of https://github.com/ethanhuey/612-2014
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014
update
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014

Conflicts:
	DriveTrain.cpp
	DriveTrain.h
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014
Fixed minor bug in smoothjoystick.cpp; it compiles now
added pitchAngle method; added auto pickup in update.
IGNORE
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014

Conflicts:
	DriveTrain.cpp
	DriveTrain.cpp~
	DriveTrain.h
	DriveTrain.h~
Added pitchAngle & autopickup. deleted clamp buttons.
Merge branch 'test' of https://github.com/ethanhuey/612-2014
Merge branch 'test' of https://github.com/ethanhuey/612-2014
Added Autonomous.h and .cpp (also fixed shooterObj)
Changed pitchAngle: removed negative angles.