enemies hurt the player again
Merge branch 'master' into dan-dev