Signed-off-by: Meteor Liu <meteor1113@gmail.com>
Merge branch 'HEAD' of https://meteor1113:Lq810406@github.com/meteor1113/document.git

Conflicts:
	org/japanese.org

Signed-off-by: Meteor Liu <meteor1113@gmail.com>