Created new bransh
after git reset --hard origin/develop
removes workspace.xml
asd
Merge branch 'develop'

Conflicts:
	.idea/workspace.xml
	README.md