cambios 17/10/2013
aa
Merge branch 'master' of https://github.com/mgargod/programacion.git