Agrego el mapping  de contenido
Ignore bin folder
Merge branch 'master' of github.com:betomoretti/Grupo11_UNLP2014