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 branch 'master' of https://github.com/AdrianDeVera/612-2014 into adrian

Conflicts:
	DriveTrain.cpp
	DriveTrain.h
Added stopAuto; fixed updateHelper
deleted ~'s
Merge branch 'master' of https://github.com/ethanhuey/612-2014

Conflicts:
	DriveTrain.cpp
	DriveTrain.h