signup stuff
Merge branch 'master' of https://github.com/umass-cs-326/team-uframe
fixed merging issue on bottomnav.ejs