Marc's turn
Merge branch 'co-motor' into motor

Conflicts:
	main/motor.pde