Including world0 map
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/app.js
Adding boot and load states
Merge remote-tracking branch 'origin/master'