Correct hitbox detection

for both EvilViking and Olaf
Merge remote-tracking branch 'origin/master'

Conflicts:
	project.greenfoot