Unvandalize. :)
日本語はちゃんと表示できるかなー
Merge branch 'master' of https://github.com/dmmtest/test

Conflicts:
	bcmp-local-1.txt