added entitytypes.
Merge branch 'master' of https://github.com/nornagon/clickfight

Conflicts:
	client.coffee
Fixed some networking jankiness