la chatte a la voisine
plop
using theirs
Merge branch 'master' of https://github.com/GPCU/CrosswordSolver

Conflicts:
	Solveur/mainwindow.cpp