ignorable changes
Merge branch 'master' of https://github.com/zhantongz/sgLabNote

Conflicts:
	SGLabNote.pro
	SGLabNote.pro.user
	main.cpp