login add
Merge branch 'master' of https://github.com/AmelieA/M7011E

Conflicts:
	package.json
	routes/index.js