guardado 22 nov 13
Merge branch 'master' of github.com:Oscarz90/GKNSICAIP