agregar los que votan
Merge remote-tracking branch 'origin/master'