Commit
commit
Merge branch 'master' of https://github.com/cniel/projetsCpp

Conflicts:
	OPCR/MainWindow/MainWindow.cpp
	OPCR/MainWindow/MainWindow.pro.user