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

Conflicts:
index.html
problema solucionado