bootstrap navbar
merge conflicts
styling
Merge branch 'master' into grids-2