update
Merge branch 'master' of https://github.com/tonysh518/carambar_03

Conflicts:
	css/layout.css
	js/lp.base.js