title 3
Merge branch 'master' of https://github.com/Zerri/html5-file-template

Conflicts:
	index.html