azerty
Merge branch 'master' of https://github.com/Lizarralde/SI3-FPKS

Conflicts:
	src/devint/model/GameModel.java
Merge branch 'master' of https://github.com/Lizarralde/SI3-FPKS