dsd
Merge branch 'master' of github.com:youngjoo0902/live

Conflicts:
	pub/css/layout_full.css
d