add komatsu
Merge remote-tracking branch 'upstream/master'

Conflicts:
	momoka.py