ignore
Merge branch 'master' of https://github.com/bazar-nazar/OperationCatalog

Conflicts:
	OperationCatalogCore/.classpath

OperationCatalogCore/.settings/org.eclipse.wst.common.project.facet.core
.xml