Commit
Merge branch 'new_branch_2'

Conflicts:
	.idea/workspace.xml