...
Merge branch 'master' of github.com:Alex-Rose/TP-2610

Conflicts:
	TP2/Inf2610TP2H2013/src/sudoku.cpp
Merge branch 'master' of github.com:Alex-Rose/TP-2610
Some work to avoid deadlocks