Hooks up map 4 to the game flow
Merge remote-tracking branch 'origin/master'

Conflicts:
	scenes.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	scenes.js
Sync from GitHub