Add entity health, fix server-side monster collision
Merge branch 'master' of https://github.com/Frogging101/ZorvWarz

Conflicts:
	entity.h
	player.cpp