added navbar
merged conflicts

Conflict:
	app/views.pyc