re-format and fixed maps
Merge branch 'master' of https://github.com/xurui203/CCC

Conflicts:
	CCC_physics/MainMenu.mm