User Interface
Merge remote-tracking branch 'origin/master'

Conflicts:
	game/src/main/java/traingame/Main.java
User Interface