cow
fuckall

This reverts commit f5da956800dd86df2a558a98051269e65d0e2fb6.

Conflicts:
	index.dwt
	library/goods_list.lbi
	library/page_footer.lbi
	library/page_header.lbi
	style.css
all
Merge branch 'master' of https://github.com/wmwang/ohed

Conflicts:
	index.dwt
	library/goods_list.lbi
	library/page_footer.lbi
	library/page_header_index.lbi