Refactored
cim
compiling
Merge branch 'master' of https://github.com/stddevs/QNote

Conflicts:
	qnote.cpp