hiro
Merge remote-tracking branch 'amekure/new-note' into new-note
Merge pull request #6 from hiroton9/new-note

New note
Merge branch 'new-note' of https://github.com/hiroton9/note into hiroton9-new-note

Conflicts:
	add_hiro.txt
add1920.txt