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

Conflicts:
	momoka.py
Merge pull request #4 from kawanoyou/master

add komatsu ibuki