Some intial scripts
Merge branch 'master' of github.com:chrismcmath/shanghai

Conflicts:
	Temp/__EditModeScene
Cells, atlases
Merge branch 'master' of github.com:chrismcmath/shanghai

Conflicts:
	Library/assetDatabase3
	Library/guidmapper
	Temp/PVRT-Feed.png
	Temp/PVRT.pvr
Fix PlayGrid
fixing gitignore