Test Commit
test2 commit
Merge branch 'master' of https://github.com/timoweiss/de.htwg.se.go.git

Conflicts:
	de.htwg.se.go/src/mvc/model/Player.java