dos2unix line endings (woo line changes)
Merge branch 'master' of https://github.com/AdrianDeVera/612-2014

Conflicts:
	DriveTrain.cpp
	DriveTrain.h
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 Shooters to main; pnum and shifters uncommneted and now uses ports.h