Working on stuff
Merge branch 'master' of https://github.com/ModwizSoftware/LD31

Conflicts:
	src/main/java/com/modwiz/ld31/leveleditor/LevelEditorMain.java
Fixed HEAD tags
Merge branch 'master' of https://github.com/ModwizSoftware/LD31

Conflicts:
	src/main/java/com/modwiz/ld31/world/GameObject.java

Fixing conflicts