Changes spawn chances of certain enemy types as you traverse dungeon levels
Merge remote-tracking branch 'origin/master'

Conflicts:
	astro_demo/src/Map.cpp