created logout
changes on log in and log out
Merge branch 'implementing_merge_code' into change_template_for_the_modal

Conflicts:
	public/scripts/modules/nav/show/show_view.js