Updated login logic
Merge branch 'master' of github.com:Commander147/CS580

Conflicts:
	routes/user.js