navbar#bootstrap
Merge pull request #4 from piadiribarne/navbar#style

navbar#bootstrap
conflict resolved