jj
Merge branch 'master' of https://github.com/ModwizSoftware/LD31

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

Conflicts:
	src/main/java/com/modwiz/ld31/Main.java