erer
Merge branch 'master' of https://github.com/kazurou147/translationcn

Conflicts:
	index.html