modelo votos
Casos de uso de anibal
Merge branch 'master' of github.com:OOTTEE/skewers

Conflicts:
	model/Pincho.php
	model/Voto.php
Merge branch 'master' of github.com:OOTTEE/skewers

Conflicts:
	controller/votarController.php