test commit
Merge branch 'master' of https://github.com/escribanoruben/g5plugins-project
Merge branch 'master' of https://github.com/escribanoruben/g5plugins-project
Cambios menores g5p.py
Cambios menores
Merge branch 'master' of https://github.com/escribanoruben/g5plugins-project

Conflicts:
	g5p.py