modif index
Merge branch 'master' of github.com:jnojay/test

Conflicts:
	index.html