修改样式，完成login.html
commit
merge
Merge remote-tracking branch 'origin/master' into gh-pages

Conflicts:
	1/cjy/css/style.css
	1/jianqing/add.html
	1/jianqing/css/reset.css
	1/jianqing/detail.html
	1/jianqing/js/line.js
	1/jianqing/js/raphael.js
	1/jianqing/login.html
	1/jianqing/project-list.html
	1/jianqing/register.html
	1/jianqing/sheji-list.html
	1/zwb/login.html