Si he cambiado esto

readme md
+ shit

+ shit
+ shit
Merge branch 'master' into gh-pages

Conflicts:
	README.md