title modif
Merge branch 'master' into myBranch

Conflicts:
	index.html
Merge remote-tracking branch 'remotes/origin/master' into myBranch