Se agrega menu y logout
Merge branch 'master' of https://github.com/martinovic/mysite

Conflicts:
	templates/base.html