Test
Test
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/pack/core/square2048/app/MainActivity.java
	app/src/main/java/pack/core/square2048/app/modele/MoteurPhysique.java