FInished Sensor
Merge commit 'a13aa0f592bf7d90812ffd2a68f6bf84353ac163'

Conflicts:
	main/main.pde
	main/sensor.pde