reglage bug briqueJaune
reglage bug dico
Merge branch 'master' of https://github.com/alizeec/tetraworld.git

Conflicts:
	tetris/.settings/org.eclipse.core.resources.prefs