Test commit
Merge branch 'master' of https://github.com/rad-corps/SpellTap
Merge branch 'master' of https://github.com/rad-corps/SpellTap

Conflicts:
	SpellTap.v11.suo
	Src/Entity.cs