Quick git test
Test commit 2
Merge branch 'master' of https://github.com/mepsilax/DungeonDesigner.git

Conflicts:
	DungeonCreator/src/OpenGLTest.java