Implemented text IO for catalogue
Merge branch 'master' of https://github.com/bertvl/POWS.git

Conflicts:
	src/model/Catalogue.java