pom solo un comentario
otro commit en branch
Merge pull request #1 from guedim/1.0.0

1.0.0
Merge branch 'master' into 1.0.1

Conflicts:
	ws_mario/ejemplo/pom.xml