Merging Template into Master

Merging Template into Master...

The main files in the "Template" are:
index.html
---persistant.css
---presentation.css