Setting mapping flag.    Hamster Version: 1.4
merge PID
Merge branch 'PID'

Conflicts:
	main/global.h
	main/main.pde
	main/maze.pde
	main/motor.h
	main/motor.pde
	main/status.h
	main/status.pde