test
Merge branch 'master' of https://github.com/mariapoveda/vocab.linkeddata.es

Conflicts:
	build/classes/parseVocabs/ReadConfig.class
	src/parseVocabs/ReadConfig.java