shifter stuff
Merge branch 'drivetrain'

Conflicts:
	further-suggestions/further-suggestions.cpp