this version too
Merge branch 'master' of github.com:japari/TestoB

Conflicts:
	chapter1.txt