added draw funcion to Entity, added shield, modified player
Merge branch 'master' into esko

Conflicts:
	src/LD30/PlayState.cpp