내비게이션 영역 수정
conflict 데이터 체크
Merge branch 'DAY07'

Conflicts:

DAY07-header-landing/PSD/960gs_96res_confirm_by_yamoo9-assets/flag-korea
.png

DAY07-header-landing/PSD/960gs_96res_confirm_by_yamoo9-assets/flag-korea
@2x.png

DAY07-header-landing/PSD/960gs_96res_confirm_by_yamoo9-assets/icon-arrow
.gif