Commit desde detached head
Merge commit 'ec5cc0d'

Conflicts:
	index.html
Index en featureas/f4
Index en features/f5
En master
Merge branch 'master' into features/f5

Conflicts:
	index.html