first commit
Merge branch 'master' of https://github.com/maruyama-dev/smallwhitenote

Conflicts:
	Memo.txt
	main.py