notificacion server.js
Merge branch 'master' of github.com:tian2992/SO1-2013S1-P1
merge
Merge branch 'master' of github.com:tian2992/SO1-2013S1-P1
Merge branch 'master' of github.com:tian2992/SO1-2013S1-P1
agregando insercion de votos
agregando el cliente de carga