[ch2] update
[update]

Merge branch 'master' of https://github.com/psygement/ecor

Conflicts:
	ch2/out/output.sample0.txt