beauty
dsdsdsMerge branch 'master' of github.com:Brom95/nav

Conflicts:
	templates/template.html