Merge remote-tracking branch 'origin/master'
...
äää
Merge remote-tracking branch 'origin/master'

Conflicts:
	OOT/src/imb/SS14/team05/halma/Computer.java
	OOT/src/imb/SS14/team05/halma/Mensch.java
	OOT/src/imb/SS14/team05/halma/Spieler.java