add logout functionality

Conflicts:
	app.js