modificando notas
Merge branch 'master' of http://github.com/CARocha/sitiosweb
nuevasmod
Merge branch 'master' of http://github.com/CARocha/sitiosweb
cambios flat
Merge branch 'master' of http://github.com/charlieweb/sitiosweb
agregando mapa de eventos