File should say Branch_2...
Modification to master without branch_2 merge
Merge branch 'branch_2'

Conflicts:
	systemtest.html

"Merged master and branch_2"