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

Conflicts:
	DriveTrain.cpp
	DriveTrain.h
Temp stuff DO NOT FORK
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
Added Autonomous.h and .cpp (also fixed shooterObj)
Changed pitchAngle: removed negative angles.
Merge pull request #44 from ChampD/master

Fixed minor bug in smoothjoystick.cpp; it compiles now
Fixed joystick initialization in Shooter
Merge branch 'master' of github.com:Chantilly612Code/612-2014
Merge branch 'master' of github.com:Chantilly612Code/612-2014
Merge branch 'master' of github.com:Chantilly612Code/612-2014
more fixes
Merge branch 'master' of github.com:Chantilly612Code/612-2014
(hopefully) fixed merge errors
Merge branch 'master' of https://github.com/ethanhuey/612-2014

Conflicts:
	Shooter.cpp
	Shooter.h
	main.cpp
Did sensors for ultraviolet and the two infrared sensors under EasterEgg.cpp and EasterEgg.h
Fixed logic.