adding world map
adding world map
Merge branch 'master' of github.com:bmceldowney/crossroads
merging with jake's changes and making the 'combat' state the default
adding world map
Merge branch 'master' of github.com:bmceldowney/crossroads
setting combat to default
adding slightly less crappy creep inheritance
Merge branch 'master' of github.com:bmceldowney/crossroads

Conflicts:
	js/game.js
adding menu screen
Added preliminary fighting. Creeps will attack frank sometimes. Franks can 'die.' Code is sucky. Did we not add the creeps to a game group?