debug
Merge branch 'master' of github.com:mveinot/QtCBM

Conflicts:
	filewindow.cpp