add login
Merge branch 'master' of https://github.com/xiaoqi55125/resume

Conflicts:
	router.js