Implementing melee
Merge branch 'master' of https://github.com/OuTopos/boss

Conflicts:
	entities/player.lua