And I wander through ideals
Reflecting all I know and how it falls into focus

Okay, so I changed the following:
-Changed the way levels are read and saved: everything is in one txt file now! Also figged the bug where levels that were more deep than they were wide were read incorrectly.
-Fixed the portal bug, we can look at this together tomorrow
-Remade the basic level!
-Reworked the different highscores, added a time-based highscore
-Tweaked the texture for the leveleditor and added a check on negative input for bullets & traps.
Merge branch 'master' of https://github.com/Rivirland/EWI3620TU-GROUP01

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.history/0/502babb4d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/10/e0e6f0b4d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/12/7036cbb4d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/16/b078dab4d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/1e/70e3c3b4d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/22/4057b2b4d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/24/603fb1b7d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/2f/c0673e27d27e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/32/3059aeb7d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/32/6062d2b4d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/37/c0858888d17e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/38/10839ab7d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/45/e012c0b4d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/47/20db8fb4d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/47/60eae5b4d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/47/f06b3c27d27e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/50/105507b5d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/50/a0f0feb4d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/6/602dc6b4d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/60/f0b896b4d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/69/208c9fb7d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/74/e07cd8b4d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/78/601ff2b4d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/79/a00efab4d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/7a/e06cb1b4d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/7d/b0f0c6b4d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/7f/7082e8b4d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/86/0078d1b4d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/88/e0fbaeb4d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/8b/d05e15b5d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/8d/e0f4c4b4d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/98/308aa3b4d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/9f/8092d7b4d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/9f/d0fbe6b4d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/a5/f0eff5b4d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/ad/c0cdfcb4d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/ad/d0aaa3b7d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/b7/d0b806b5d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/c2/80dca1b4d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/c5/b09899b7d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/c6/a0d203b5d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/c6/e0c6a2b4d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/cf/00f9fab4d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/d8/8011aeb4d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/e3/4024f9b4d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/ed/00dbffb4d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.history/f8/e006b0b7d47e00131f89bbd7a164bc08
	.metadata/.plugins/org.eclipse.core.resources/.projects/MazeRunner/.indexes/df/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MazeRunner/.indexes/e4/11/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MazeRunner/.indexes/e4/5f/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MazeRunner/.indexes/e4/be/history.index
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/2451842633.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	MazeRunner/bin/engine/GeneticAlgorithm.class
	MazeRunner/bin/engine/Maze.class
	MazeRunner/bin/engine/MazeRunner.class
	MazeRunner/bin/engine/Player.class
	MazeRunner/bin/engine/Portal.class
	MazeRunner/bin/items/BulletHolder.class
	MazeRunner/bin/items/TrapHolder.class
	MazeRunner/bin/levelEditor/LevelEditorWorld.class
	MazeRunner/db/mydatabase.db
	MazeRunner/levels/exitstan.txt
	MazeRunner/levels/exitstan_t.txt
	MazeRunner/levels/testlevel.txt
	MazeRunner/levels/testlevel_t.txt
	MazeRunner/src/engine/Portal.java
	MazeRunner/worlds/world.txt