Back de intro_joins ... Base de datos en mysql
Cambio para probar pull
Merge branch 'develop' of https://github.com/hisapy/uni-bd-2014 into develop