ignore idea workspace.xml
Merge branch 'master' of https://github.com/jerome-breton/MineBots

Conflicts:
	.idea/workspace.xml
ignore idea workspace.xml