change file name
Merge branch 'master' into gh-pages
nav links changed - corrcted to make them link to html pages again