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

Conflicts:
	part c maze and 2048/src/game2048/model/Game2048Model.java