55
Merge branch 'master' of github.com:xzhy527/qtCanyin

Conflicts:
	mainwindow.cpp