Merge branch 'spells'

Conflicts:
	src/GamePanel.java