japanese utitai
Merge branch 'master' of https://github.com/k1hiiragi/practice

Conflicts:
	okasi.txt

japanese utitai