grille ok
Merge branch 'master' of
https://github.com/bibiLoveU/ProjectMethodDevelopment.git

Conflicts:
	ProjectMethodDevelopment/src/model/Board.java
	ProjectMethodDevelopment/src/model/IBoardStrategy.java