Branch Commit test
Branch Test
Merge branch 'LiranBranch' into Johnnatan-Branch

Conflicts:
	src/game2048/Game2048.java
Commit
Merge branch 'Johnnatan-Branch' into LiranBranch