asdas

dasd
Merge branch 'Master-brancj' of https://github.com/Vossen-Konijnen/Vossen-Konijnen-Groep-C into Master-brancj

Conflicts:
	src/main/SimulatorView.java