for show
Merge branch 'master' of https://github.com/copacetic/edulux

Conflicts:
	simulator.py
Merge branch 'master' of https://github.com/copacetic/edulux
whatever
Merge branch 'master' of https://github.com/copacetic/edulux
inch vor e