a
Merge branch 'master' of github.com:QuentinLB/ball_games_ontology

Conflicts:
	catalog-v001.xml