Editadas las rutas
Merge branch 'master' of https://github.com/Saporules/SocialFrame

Conflicts:
	index.html