simple ex
Merge remote-tracking branch 'origin/master' into jungchoco

Conflicts:
	src/main/webapp/home.htm
vo 설정