nuevos
Merge branch 'master' of https://github.com/feantot/potencia

Conflicts:
	script.R