Iets
Merge branch 'master' of https://github.com/boontje1994/TIA4
nog Iets
Merge branch 'master' of https://github.com/boontje1994/TIA4

Conflicts:
	Festivalplanner 1.0/src/Simulator/Map.java
JTable data fix
Merge branch 'master' of https://github.com/boontje1994/TIA4