ejercicio tema 4 (1 al 4)
Merge https://github.com/JJ/GII-2014
Merge pull request #491 from marquina91/master

tema 4 (del 1 al 4)