Merge branch 'master' of https://github.com/ramoslm/bifrcu

Conflicts:
prueba.txt
Merge branch 'master' of https://github.com/ramoslm/bifrcu