edit ado en desktop
Merge branch 'master' of https://github.com/jpgarella/Spoon-Knife

Conflicts:
	index.html