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

Conflicts:
	DriveTrain.cpp
	DriveTrain.h
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
Added Autonomous.h and .cpp (also fixed shooterObj)
Merge branch 'master' of github.com:Chantilly612Code/612-2014
(hopefully) fixed merge errors
(hopefully) added Autonomous
IGNORE

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

Conflicts:
	Shooter.cpp
	Shooter.h
Added back main.cpp
Fixed compile errors