Added Scheucher
Bug fixed
Merge branch 'hallobranch'

Conflicts:
	Main.java
Moved Thomas to own class