makes a working naviation menu.
Merge branch 'master' into nav

Conflicts:
	app/templates/temp.html
renames the temporary template so I can merge in master.
adds a working navigation menu to the testing form.
removes my venv directory (again)