b
c
Merge branch 'new_branche'

Conflicts:
	new_doc.txt