merged chapter strings
chapter merged strings
Merge branch 'master' of github.com:rafiks/my-sandbox

new chapter
Merge branch 'master' of github.com:rafiks/my-sandbox

Conflicts:
	hello