adding world map
Merge branch 'master' of github.com:bmceldowney/crossroads
merging with jake's changes and making the 'combat' state the default
Merge branch 'master' of github.com:bmceldowney/crossroads

Conflicts:
	js/game.js
adding menu screen