Fixing variable.
Marc's update
Merge branch 'PID'

Conflicts:
	main/main.pde
	main/motor.pde