MAYOORRRR bugfix & texture loading is fixed!!
Merge branch 'master' of https://github.com/Rivirland/EWI3620TU-GROUP01

Conflicts:
	MazeRunner/bin/engine/MazeRunner.class
	MazeRunner/bin/levelEditor/Catalogus.class
	MazeRunner/levels/joris_o.txt
	MazeRunner/src/engine/MazeRunner.java