user repo
Merge branch 'user'

Conflicts:
	server.js
removed console log
Merge branch 'user'