edited line 20 and 22 ...and I'm right
Merge branch 'edit_line_20_and_22' into development

Conflicts:
	this is a test doc.txt