Signed-off-by: Annabelle <annabelle1997@hotmail.com>
Merge branch 'master' of https://github.com/ISNTeamDumezil/picross

Conflicts:
	SynthèseAnnabelle.odt

Signed-off-by: Annabelle <annabelle1997@hotmail.com>