test .idea/workspace.xml
test2
test
test4
Merge branch 'Gregory'

Conflicts:
	.idea/workspace.xml