edition gui
Merge branch 'master' of https://github.com/ameisso/miniprojet-image

Conflicts:
	main.cpp