Added new feature to damage
Merge branch 'develop' of github.com:ggj/ggj14 into develop

Conflicts:
	source/entity/playerentity.cpp