fermetureSimple
Merge branch 'master' of https://github.com/joelrandria/analyse_tp1

Conflicts:
	tp1/EdgeDetectionWindow.cpp
Merge branch 'master' of https://github.com/joelrandria/analyse_tp1