test
Merge https://github.com/indochinahub/khmer_book

Conflicts:
	003addition.odt
commit