minor cleanup
Merge branch 'master' of https://github.com/estallings/killsteal

Conflicts:
	src/entity.lua