Cambio desde LOCAL
Merge branch 'master' of https://github.com/pabloppp/PAROTESTS

Conflicts:
	README.md