Cannon draws in front of fire
Fixed merge conflict

Conflicts:

	MeteorDefense/src/com/esnefedroetem/meteordefense/renderer/GameRenderer.java