Tweede aflevering
Merge branch 'master' of https://github.com/Chaiba/PaF-assignment-2

Conflicts:
	PaF-Assignment-2/src/model/datahandler/DataHandler.java