branchTest commit
branchTest commit 1
branch Test commit
branch Test commit
Merge branch 'master' into branchTest

Conflicts:
	.idea/workspace.xml
Merge branch 'branchTest'

Conflicts:
	.idea/workspace.xml