ça marche mageule du coup j'commit
Merge origin/master

Conflicts:
	Tetris/src/Modele/Piece.java
Merge origin/master

Conflicts:
	Tetris/src/Modele/Piece.java