some changes
Merge branch 'master' of https://github.com/sdzelman/2048-Game

Conflicts:
	Game2048/Game3072$1.class
	Game2048/Game3072.class