Merge branch 'spells'

Disables drawing of spells due to removal of draw(Graphics g) from Spell

Conflicts:
	src/Fireblast.java
	src/Player.java
	src/Projectile.java