Catalogue continues
Merge branch 'master' of https://github.com/Eipifi/Ariadne

Conflicts:
	src/ariadne/data/Hash.java