Created template
Changed header and title
Merge branch 'master' into gh-pages