Ajustements header
Merge branch 'master' of github.com:vibby/hophop

Conflicts:
	index.html