변경

내용 삭제와 변경
Revert "Revert "Revert "세부내용"""

This reverts commit 1a3ec66c18a6c84f5a6fd2348a27ec38d2e3deb5.
Merge remote-tracking branch 'origin/프로젝트1-2'

Conflicts:
	레이아웃5.psd