added getEntityType to entity
Merge branch 'master' of https://github.com/tpham93/SpaceLetters

Conflicts:
	SpaceLetters/SpaceLetters/Game/Entity/Entity.cs
	SpaceLetters/SpaceLetters/Game/Entity/Projectiles.cs