test
Merge branch 'master' of https://github.com/bdludwig/Thymio.git

Conflicts:
	Thymio/src/observer/ExperimentPanel.java