update
Merge branch 'master' of https://github.com/breeze1990/StickyNotes

Conflicts:
	main.cpp