Unfricked.. again...
Merge branch 'master' of https://github.com/Kyrai/The-Labyrinth

Conflicts:
	The Labyrinth/.metadata/.log
	The Labyrinth/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	The Labyrinth/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml

	modified:   The Labyrinth/.metadata/.log
	modified:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.projects/The Labyrinth/.indexes/e4/d9/de/history.index
	modified:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.projects/The Labyrinth/.markers
	deleted:    The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.root/4.tree
	deleted:    The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.root/9.tree
	modified:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	modified:   The Labyrinth/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	modified:   The Labyrinth/.metadata/.plugins/org.eclipse.jdt.core/3462050987.index
	modified:   The Labyrinth/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	modified:   The Labyrinth/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	modified:   The Labyrinth/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	modified:   The Labyrinth/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	deleted:    The Labyrinth/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png
	deleted:    The Labyrinth/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png
	deleted:    The Labyrinth/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/2.png
	modified:   The Labyrinth/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	modified:   The Labyrinth/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml