bottomnav
Merge branch 'master' of https://github.com/umass-cs-326/team-uframe
Merge branch 'master' of https://github.com/umass-cs-326/team-uframe
fix to uframedb.lib, removed h1 from frame
Merge branch 'master' of https://github.com/umass-cs-326/team-uframe