런처 씬정보 불러오
Merge remote-tracking branch 'origin/master'

Conflicts:
	battle/index.html