[다혜] index 변경
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/app/partials/index.html