aaa
bbb
log added
finished!
Merge remote-tracking branch 'origin/master' into binding

Conflicts:
	routes/indexPage.js
Add update and fix bugs
Merge remote-tracking branch 'origin/master' into binding

Conflicts:
	views/main.jade
Connect export with front-end
Merge branch 'master' into binding
Add person.grade
Handle the login/logout bugs