Added Icespell and Teleport
Do not know how to stash
Merge branch 'spells'
Merge branch 'grid'

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