Did work on the templates.
Merge branch 'master' of github.com:MichielDeMey/A-Brave-New-Web

Conflicts:
	css/source/theme.scss
	slides/html-templates-declaration.html