hot product info
merger
merger comflicts
resolve conflicts
resolve
merge conflict of master
merge conflict of master
Merge branch 'master' of https://github.com/wangana/oc-taobao-mockup

Conflicts:
	index.html