Merge pull request #24 from cca-team3-webproject/master

2시 머지
로고, topbar 정렬
Merge pull request #28 from cca-team3-webproject/권

권