encoding Shift-JIS -> UTF-8
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md