initial commit for dev_2
수정했습니다.
Merge branch 'dev_2' into dev_1

Conflicts:
	index.html