added extra text
Merge branch 'master' into gh-pages
changed lab nav text
Merge branch 'master' into gh-pages