Started branch_3
Made changes to the master branch
Merge branch 'branch_3'

Conflicts:
	.idea/workspace.xml

"Merging master and branch_3"