new
Merge branch 'Atlas_2'

Conflicts:
	Gemini/Assets/Script/CharControl_upanddown2.cs