langsames Anfahren
Merge branch 'master' of https://github.com/zabtekdotde/in-workshop

Conflicts:
	src/de/hfu/workshop/Main.java
	src/de/hfu/workshop/core/Config.java