Minimap
Merge branch 'master' of https://github.com/Rivirland/EWI3620TU-GROUP01

Conflicts:
	MazeRunner/bin/engine/MazeRunner.class
	MazeRunner/db/mydatabase.db
Merge branch 'master' of https://github.com/Rivirland/EWI3620TU-GROUP01

Conflicts:
	MazeRunner/bin/levelEditor/LevelEditor.class
	MazeRunner/db/mydatabase.db