Rectification espace/saut de ligne
rename variable
Merge remote-tracking branch 'origin/remiseAniveau'

Conflicts:
	src/unoGameProject/src/unoGame/controller/AbstractController.java
	src/unoGameProject/src/unoGame/controller/CardController.java
	src/unoGameProject/src/unoGame/controller/GameController.java
	src/unoGameProject/src/unoGame/model/AbstractModel.java
	src/unoGameProject/src/unoGame/unoGame.java