se hace commit
pom para intentar poner al master
Merge branch 'master' into 1.0.1

Conflicts:
	ws_mario/ejemplo/pom.xml
Merge pull request #2 from guedim/1.0.1

PUll request para brach 1.0.1