No comment
Merge branch 'master' of https://github.com/sandbeck/esdj-handin1.git

Conflicts:
	src/sensor/Sensor.java