こめんとをきれいに
Merge branch 'develop'

Conflicts:
	wikiconv.sh
Merge branch 'master' of https://github.com/ayuthky/test

Conflicts:
	wikiconv.sh