Testing merging
Merge branch 'master' into firstBranch

Conflicts:
	branch_doc.txt
Second Merge Testing