Merge branch 'master' into firstBranch
Testing merge
Merge branch 'master' into firstBranch

Conflicts:
	branch_doc.txt
Merge branch 'firstBranch'