Initial commit
第一次提交
添加新页面
弹出框基本成型
重新提交

增加登录页面
Revert "重新提交"

Conflicts:
	common/css/base.css
	common/font/icomoon.eot
	common/font/icomoon.svg
	common/font/icomoon.woff
	common/js/min/base-ck.js
	config.codekit
	index.html
	首页.html
Revert "修改背景"

This reverts commit a4aefd84bc22d2500c8ade71b5d31d383a1c97ee.
Revert "修改bug"

This reverts commit ff4a9271025a56c6177bedffad3071fa94fbe3e6.
重新提交
登录
添加首页
Merge branch 'master' into gh-pages

Conflicts:
	common/css/base.css
	common/img/login_bg.jpg
	common/img/logo.png
	config.codekit
	index.html
	page/会员中心.html
	首页.html