horror
Merge branch 'master' of https://github.com/caward/Sensor

Conflicts:
	bin/DynamicSensor.class