resizing images
linking up some of the stuff in the nav
Merge branch 'master' into gh-pages