redo page
Merge branch 'master' into gh-pages
test
new headers
pages
merged
gitignore