yours,
Merge branch 'master' of https://github.com/s-rc/Notes

Conflicts:
	NoteCard.py
	NoteStack.py