quitando estilo
Merge branch 'master' of https://github.com/jesusnoseq/nodepong

Conflicts:
	presentacion/index.html