Third Edit
Merge branch 'firstBranch'

Conflicts:
	branch_doc.txt