trying to fix graphics order
Merge branch 'master' of https://github.com/kongming92/emgame

Conflicts:
	JBox2D/jbox2d-testbed/levels/capacitor.txt
	JBox2D/jbox2d-testbed/levels/evil.txt
	JBox2D/jbox2d-testbed/src/main/java/org/jbox2d/testbed/framework/j2d/TestbedSidePanel.java
Merge branch 'master' of https://github.com/kongming92/emgame
Merge branch 'master' of https://github.com/kongming92/emgame
added a level and changed some wall stuff
Merge branch 'master' of https://github.com/kongming92/emgame

Conflicts:
	JBox2D/jbox2d-testbed/src/main/java/org/jbox2d/testbed/framework/TestList.java
changed some wall stuff and spiral.txt