Changed a few files to add lvl 3 2 entities
Merge branch 'master' of https://github.com/zombiepaladin/geoworld

Conflicts:
	src/js/game_events.js