Inizio
Merge branch 'master' of https://github.com/istevene/fx2048

Conflicts:
	src/game2048/GameManager.java