master commit
Merge branch 'branchTest'

Conflicts:
	.idea/workspace.xml
master commit
Merge remote-tracking branch 'origin/branchTest'