Add Makoto and Yukiho
Merge remote-tracking branch 'pr/work'

Conflicts:
	README.md