reorganized navbar divs
changed to bootstrap collapsible navbar
Merge branch 'master' into navbar
Merge pull request #32 from ahsterling/navbar

Navbar