added nav icons
resolved conflicts I think
Merge branch 'master' of https://github.com/davemcmurray/nib-style-guide