update
Merge branch 'master' of https://github.com/woutthielemans/cp3-eindopdracht-groep19

Conflicts:
	Converter/.idea/misc.xml
	Converter/.idea/workspace.xml