modified:   The Labyrinth/.metadata/.log
	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
	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/externalLibsTimeStamps
	modified:   The Labyrinth/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.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
Merge branch 'master' of github.com:Kyrai/The-Labyrinth

Conflicts:
	The Labyrinth/.metadata/.log
	The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.projects/The Labyrinth/.markers
	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/externalLibsTimeStamps
	The Labyrinth/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	The Labyrinth/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml

	modified:   The Labyrinth/.metadata/.log
	new file:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.history/1f/c048be85f19b001218a0fcbbb80e4270
	new file:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.history/4/20c83803f29b001218a0fcbbb80e4270
	new file:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.history/42/9013b133f29b001218a0fcbbb80e4270
	new file:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.history/49/c0c3249c459b00121429ef025542ca7c
	new file:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.history/4a/0006ec0af19b001218a0fcbbb80e4270
	new file:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.history/5a/40e26f1b379b00121cf6d31dba06526b
	new file:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.history/5f/a024a843f29b001218a0fcbbb80e4270
	new file:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.history/68/8047427ef29b001218a0fcbbb80e4270
	new file:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.history/6a/806554c7429b00121429ef025542ca7c
	new file:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.history/77/c09228b5459b00121429ef025542ca7c
	new file:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.history/8e/40eb678e459b00121429ef025542ca7c
	new file:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.history/9/b0bc59c7429b00121429ef025542ca7c
	new file:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.history/b6/50dd9e6e459b00121429ef025542ca7c
	new file:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.history/b6/90afe728449b00121429ef025542ca7c
	new file:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.history/b8/c0dc8394439b00121429ef025542ca7c
	new file:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.history/bb/d088154c439b00121429ef025542ca7c
	new file:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.history/bc/c07257c7429b00121429ef025542ca7c
	new file:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.history/c3/007feb208b9b00121342a775e44fb0cd
	new file:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.history/c7/20dfe9c1439b00121429ef025542ca7c
	new file:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.history/c8/70fc8d1c379b00121cf6d31dba06526b
	new file:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.history/d0/a0b2d99af49b001218a0fcbbb80e4270
	new file:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.history/d7/80d55c53f29b001218a0fcbbb80e4270
	new file:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.history/db/e075ef40459b00121429ef025542ca7c
	new file:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.history/df/206a84a1439b00121429ef025542ca7c
	new file:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.history/e4/a052f1ecf49b001218a0fcbbb80e4270
	new file:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.history/e8/206cb71e379b00121cf6d31dba06526b
	new file:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.history/ef/4042e9bf459b00121429ef025542ca7c
	new file:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.history/f8/a0e1eeecf49b001218a0fcbbb80e4270
	modified:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.projects/The Labyrinth/.indexes/8b/history.index
	modified:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.projects/The Labyrinth/.indexes/e4/9f/history.index
	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/org.eclipse.jdt.core/state.dat
	new file:   The Labyrinth/.metadata/.plugins/org.eclipse.core.resources/.root/9.tree
	modified:   The Labyrinth/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	modified:   The Labyrinth/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	modified:   The Labyrinth/.metadata/.plugins/org.eclipse.jdt.core/1498219845.index
	modified:   The Labyrinth/.metadata/.plugins/org.eclipse.jdt.core/3065916431.index
	modified:   The Labyrinth/.metadata/.plugins/org.eclipse.jdt.core/3462050987.index
	modified:   The Labyrinth/.metadata/.plugins/org.eclipse.jdt.core/3974580528.index
	modified:   The Labyrinth/.metadata/.plugins/org.eclipse.jdt.core/4155206848.index
	modified:   The Labyrinth/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	modified:   The Labyrinth/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	modified:   The Labyrinth/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
	modified:   The Labyrinth/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml
	modified:   The Labyrinth/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	modified:   The Labyrinth/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	modified:   The Labyrinth/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	modified:   The Labyrinth/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	modified:   The Labyrinth/The Labyrinth/.classpath
	modified:   The Labyrinth/The Labyrinth/.settings/org.eclipse.jdt.core.prefs
	modified:   The Labyrinth/The Labyrinth/bin/Graphics/Face.class
	modified:   The Labyrinth/The Labyrinth/bin/Graphics/Model.class
	modified:   The Labyrinth/The Labyrinth/bin/Graphics/OBJLoader.class
	modified:   The Labyrinth/The Labyrinth/bin/Graphics/Sprite.class
	modified:   The Labyrinth/The Labyrinth/bin/Graphics/Texture.class
	modified:   The Labyrinth/The Labyrinth/bin/Graphics/TextureLoader.class
	modified:   The Labyrinth/The Labyrinth/bin/Graphics/Vertex.class
	modified:   The Labyrinth/The Labyrinth/bin/Labyrinth/Block.class
	modified:   The Labyrinth/The Labyrinth/bin/Labyrinth/Chunk.class
	modified:   The Labyrinth/The Labyrinth/bin/Labyrinth/Entity.class
	modified:   The Labyrinth/The Labyrinth/bin/Labyrinth/EntityPlayer.class
	modified:   The Labyrinth/The Labyrinth/bin/Labyrinth/EnumGraphicsLevel.class
	modified:   The Labyrinth/The Labyrinth/bin/Labyrinth/LabyrinthPiece.class
	modified:   The Labyrinth/The Labyrinth/bin/Labyrinth/LabyrinthPieceHall.class
	modified:   The Labyrinth/The Labyrinth/bin/Labyrinth/MenuSystem.class
	modified:   The Labyrinth/The Labyrinth/bin/Labyrinth/Options.class
	modified:   The Labyrinth/The Labyrinth/bin/Labyrinth/RendererBlock.class
	modified:   The Labyrinth/The Labyrinth/bin/Labyrinth/Timer.class
	modified:   The Labyrinth/The Labyrinth/bin/Labyrinth/World.class
	modified:   The Labyrinth/The Labyrinth/bin/Main/Labyrinth.class
	modified:   The Labyrinth/The Labyrinth/bin/Main/Start.class
	modified:   The Labyrinth/The Labyrinth/bin/Main/States/GameData.class
	modified:   The Labyrinth/The Labyrinth/bin/Main/States/MenuData.class
	modified:   The Labyrinth/The Labyrinth/bin/Main/States/StartData.class
	modified:   The Labyrinth/The Labyrinth/bin/Main/States/State.class
	modified:   The Labyrinth/The Labyrinth/bin/Main/States/StateGame.class
	modified:   The Labyrinth/The Labyrinth/bin/Main/States/StateMenu.class
	modified:   The Labyrinth/The Labyrinth/bin/Main/States/StateStart.class
	modified:   The Labyrinth/The Labyrinth/src/Labyrinth/EntityPlayer.java
	modified:   The Labyrinth/The Labyrinth/src/Labyrinth/LabyrinthPiece.java
	modified:   The Labyrinth/The Labyrinth/src/Labyrinth/LabyrinthPieceHall.java
	modified:   The Labyrinth/The Labyrinth/src/Labyrinth/RendererBlock.java
	modified:   The Labyrinth/The Labyrinth/src/Labyrinth/World.java
	modified:   The Labyrinth/The Labyrinth/src/Main/States/GameData.java
	modified:   The Labyrinth/The Labyrinth/src/Main/States/StateGame.java
	modified:   The Labyrinth/The Labyrinth/src/Main/States/StateMenu.java
	modified:   The Labyrinth/The Labyrinth/src/Main/States/StateStart.java