fixed

Conflicts:
	src/main/GamePanel.java