doit
doit
Merge branch 'br1'

Conflicts:
	gitlesson/common/c.txt