agregando twitter decalogo
Merge remote-tracking branch 'origin/edicion2014' into gh-pages