ewdd
Merge branch 'master' of
https://github.com/Team4Game/de.htwg.se.setGame.git

Conflicts:
	de.htwg.se.SetGame/src/setgame/aview/tui/TextUI.java