bunch of small changes
trying to pull
Merge branch 'master' of https://github.com/umass-cs-326/team-uframe

Conflicts:
	UFrame/routes/f.js
	UFrame/views/partials/bottomnav.ejs