meaningful commit message
Merge branch 'master' of https://github.com/sternze/Reversi_FPTBS.git

Conflicts:
	Reversi/src/uni_klu/se2/reversi/engine/ReversiEngine.java
	Reversi/src/uni_klu/se2/reversi/engine/player/DeepMinMaxComputerPlayer.java
	Reversi/src/uni_klu/se2/reversi/engine/player/SocketPlayer.java
	Reversi/src/uni_klu/se2/reversi/gui/test.java
	Reversi/src/uni_klu/se2/reversi/helper/SocketHelper.java