Time update
Merge branch 'master' of https://github.com/boontje1994/TIA4

Conflicts:
	Festivalplanner 1.0/src/Simulator/MainWindow.java
Merge branch 'master' of https://github.com/boontje1994/TIA4
Iets
Merge branch 'master' of https://github.com/boontje1994/TIA4