namchi nanchi
nanchi
Merge branch 'master' of https://github.com/HappyHopeSnow/helloword
fffff

Conflicts:
	riji.txt