modifico f2
Merge branch 'master' of https://github.com/kleix/prueba1