New routes for login
Merge branch 'master' of https://github.com/TheFourMonkeysProject/Torque

Conflicts:
	app/package.json
	app/routes/index.js
	app/server.js