js수정
Merge branch 'master' of github.com:youngjoo0902/wjfood

Conflicts:
	css/common.css
	js/common.js