nav bar now turns into a grid (shrinking in number of cols) as screen size is decreased... other stuff with nav fixed too
Merge remote-tracking branch 'origin/master'