updating header x2
Merge branch 'master' of https://github.com/cfatesta/test02

Conflicts:
	index.html