Lo que hicimos al mediodia.
Merge branch 'master' of https://github.com/juanmjacobs/gestion2c2013