Typo
Merge remote-tracking branch 'origin/master'

Conflicts:
	secureApp/server_secure.js
Merge remote-tracking branch 'origin/master'
Added login and logout to routes.js