Added enemy display data
Merge branch 'develop' of github.com:ggj/ggj14 into develop
Removing enemy when it dies
Merge branch 'develop' of github.com:ggj/ggj14 into develop

Conflicts:
	source/entity/enemyentity.cpp
	source/entity/enemyentity.h