Segundo commit

He añadido un fichero a este commit (El de Fran)
Merge branch 'branch_test_fran'
Merge branch 'master' into branch_test_fran
Merge branch 'branch_test_fran'