Added EntityTypes to Entity.
Merge branch 'master' of https://github.com/AdvaiticSongs/Smashteroids

Conflicts:
	SFML-Book-Tutorial/Asteroid.h