added navbar with temp menus.
Users displaying on map
fix merge conflicts
Merge branch 'gabe'
Fix? merge conflicts
Merge branch 'nManos'
trying to fix git problems
Merge pull request #23 from sunny-mittal/nManos

trying to fix git problems
Fix dependencies
blerb