Merge branch 'master' of https://github.com/KryptoCake/PG-Codigo

Conflicts:
	adds y pruebas.txt
Merge branch 'master' of https://github.com/KryptoCake/PG-Codigo

Conflicts:
	adds y pruebas.txt