Halls can generate!!

But they don't...
Com
No real changes
Bug fixes
More bug fixes
Jimmy's changes  .-.
Wut
Something... mabey...
.-.
More... D;
Merge branch 'master' of https://github.com/Kyrai/The-Labyrinth

Conflicts:
	The Labyrinth/.metadata/.log
	The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.projects/The Labyrinth/.indexes/8b/history.index
	The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.projects/The Labyrinth/.indexes/e4/9f/history.index
	The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.projects/The Labyrinth/.indexes/e4/d9/de/history.index
	The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.projects/The Labyrinth/.markers
	The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.projects/The Labyrinth/org.eclipse.jdt.core/state.dat
	The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	The Labyrinth/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	The Labyrinth/.metadata/.plugins/org.eclipse.jdt.core/1498219845.index
	The Labyrinth/.metadata/.plugins/org.eclipse.jdt.core/3065916431.index
	The Labyrinth/.metadata/.plugins/org.eclipse.jdt.core/3462050987.index
	The Labyrinth/.metadata/.plugins/org.eclipse.jdt.core/3974580528.index
	The Labyrinth/.metadata/.plugins/org.eclipse.jdt.core/4155206848.index
	The Labyrinth/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	The Labyrinth/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	The Labyrinth/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	The Labyrinth/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml
	The Labyrinth/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	The Labyrinth/The Labyrinth/bin/Graphics/Sprite.class
	The Labyrinth/The Labyrinth/bin/Labyrinth/MenuSystem.class
	The Labyrinth/The Labyrinth/bin/Main/Labyrinth.class
	The Labyrinth/The Labyrinth/bin/Main/States/StateMenu.class
	The Labyrinth/The Labyrinth/bin/Main/States/StateStart.class
	The Labyrinth/The Labyrinth/src/Main/States/StateMenu.java
	The Labyrinth/The Labyrinth/src/Main/States/StateStart.java

	modified:   The Labyrinth/.metadata/.log
	modified:   The Labyrinth/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	modified:   The Labyrinth/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	modified:   The Labyrinth/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml
	modified:   The Labyrinth/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	modified:   The Labyrinth/The Labyrinth/src/Main/States/StateMenu.java
	modified:   The Labyrinth/The Labyrinth/src/Main/States/StateStart.java