123
Merge branch 'master' of https://github.com/miri86kn/JAVA_Ex3.git

Conflicts:
	JavaEx3/src/view/Game2048View.java