UI change
merge
signup backend change
signup backend change2
something before signup
Merge remote-tracking branch 'changyou/master'

Conflicts:
	app/styles/main.css
	app/views/index.html
merge from changyou
Merge pull request #7 from meterler/master

登录页美化+注册页后台修改
Merge pull request #4 from changyou/master

mege changyou to me
Merge branch 'megebranch'

Conflicts:
	lib/controllers/users.js
	lib/routes.js
update module add cxj_liang@126.com user