Pre-merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	exercice2.pro
	mainfenetre.cpp