second commit
Merge branch 'hyewon'
hahaha
third commit
third commit
branch 전체 merge
git add all
Merge remote-tracking branch 'origin/hyewon' into jjung

Conflicts:
	.DS_Store
Merge remote-tracking branch 'origin/master' into jjung

Conflicts:
	.gitignore
	evaluation.css
오타 수정