Test commit
Merge branch 'master' of github.com:dudisrea1/MazeAnd2048

Conflicts:
	src/Game2048/Cell.java
	src/Game2048/Game2048View.java
	src/view/Board.java