Merge branch 'master' into gh-pages
made nav bar more streamlined
added forgotten About link....
Merge branch 'gh-pages'
Merge branch 'master' of https://github.com/AstroTeam/Astro