merge conflict
fixed merge conflicts
Merge branch 'master' of github.com:121watts/the_pivot
Merge branch 'master' of github.com:121watts/the_pivot
Merge branch 'master' of github.com:121watts/the_pivot
Merge branch 'master' of github.com:121watts/the_pivot
Deleted code duplication and nesting in css for navbar
fixed two merge conflicts
Merge pull request #167 from 121watts/navbar

Navbar