added health
Merge branch 'master' of https://github.com/leaflet757/cs20

Conflicts:
	entities/map.js
	main.js