ñeñeññeñeñeñe
Merge remote-tracking branch 'origin/master'

Conflicts:
	funciones.py
Merge branch 'master' of https://github.com/Guatoncito/peliculiao

Conflicts:
	funciones.py