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 http://github.com/AdrianDeVera/612-2014
Merge branch 'master' of https://github.com/AdrianDeVera/612-2014 into adrian
Modified update. Doesn't call Autos anymore
Merge branch 'adrian' of https://github.com/ethanhuey/612-2014
Merge branch 'master' of http://github.com/Chantilly612Code/612-2014
Changed NeededDegrees to NeededDistance
Merge branch 'adrian' of https://github.com/ethanhuey/612-2014
Updated DriveTrain (includes a function to check for autonomous)
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014

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

Conflicts:
	DriveTrain.cpp
	DriveTrain.h
Merge pull request #36 from BenNgu/master

ben's changes