Commit vcoria
Merge branch 'master' of github.com:mcoria/mispruebas

Conflicts:
	README.txt