Merge
Merge branch 'master' of https://github.com/jasminen/SolverServer.git

Conflicts:
	SolverServer/src/model/minimaxAB/MinimaxAB.java