changes
Merge branch 'master' of https://github.com/Oleur/TP_FITTS
fiits
Merge branch 'master' of https://github.com/Oleur/TP_FITTS

Conflicts:
	mainwindow.cpp