Commit v.1.2
Commit v0.1.3
Merge branch 'master' of https://github.com/TurnsOfHi/Notes

Conflicts:
	NoteCard.py
	collection.py
	main.py
	notestack.py
v