add logout
Merge branch 'master' of https://github.com/Lina128/canalytics

Conflicts:
	public/files/instruction/instruction.html