change
Merge branch 'master' of https://github.com/dlieldx/MazeAnd2048.git

Conflicts:
	part c maze and 2048/src/algorithms/Minimax.java
	part c maze and 2048/src/model/Game2048Model.java
	part c maze and 2048/src/presenter/ServerRun.java
	part c maze and 2048/src/view/game2048/Game2048View.java