cambio line escrita desde el mac
amado otra linea
Merge branch 'master' of https://github.com/fomdeveloper/Spoon-Knife

Conflicts:
	index.html