ignor idea
ignor idea
Merge branch 'master' of https://github.com/smidaamine/OSM-Tech

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of https://github.com/smidaamine/OSM-Tech

Conflicts:
	.gitignore