kajsdks
Merge branch 'master' of github.com:BasilakisS/opferkind

Conflicts:
	Praxis/GameManagement/src/game_management/pairing/PairingCalculator.java