cleaned up so it would compile
Merge remote-tracking branch 'origin/master'

Conflicts:
	functions/fourWheelMovement.c