Cambios en descirption
Merge branch 'master' into develop

Conflicts:
	README.md
Back de intro_joins ... Base de datos en mysql
Merge branch 'develop' of https://github.com/hisapy/uni-bd-2014