troll(trundle)
Merge branch 'master' of https://github.com/renekeijzer/LegoRobot

Conflicts:
	src/SensorHandler.java