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
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 pull request #38 from ZackAlfakir/master

.gitignore
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
dos2unix line endings (woo line changes)
Merge branch 'master' of https://github.com/AdrianDeVera/612-2014

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
Fixed logic in DriveTrain for stopping auto
Added update for shooter. Had to make axis in SmoothJoystick global and create a SmoothJoystick Object
Added Rollers to Shooter update method
Merge branch 'master' of https://github.com/Ahmad-Bamba/612-2014

Conflicts:
	Shooter.cpp
	SmoothJoystick.cpp
	SmoothJoystick.h
	controls.h
Added function registry update to main