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
Temp stuff DO NOT FORK
IGNORE
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014

Conflicts:
	DriveTrain.cpp
	DriveTrain.cpp~
	DriveTrain.h
	DriveTrain.h~
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)
Merge branch 'master' of github.com:Chantilly612Code/612-2014
(hopefully) fixed merge errors
Did sensors for ultraviolet and the two infrared sensors under EasterEgg.cpp and EasterEgg.h