iroiro
あ
aa
irir
あ
mas
a
Merge branch 'shunsuke_branch'

Conflicats:
	bin/Manga4.apk
	bin/resources.ap_