+ Texto
+ Texto
+ texto
Merge branch 'gh-pages' of https://github.com/alfonsogildegea/huesos.git
into gh-pages

Conflicts:
	index.html
+ index.html
+ texto "Huesos"
Merge branch 'gh-pages' of https://github.com/alfonsogildegea/huesos.git
into gh-pages

Conflicts:
	index.html
+fix
+ "Huesos"