modelado base
Agregada Django App para API de Escrutinio Social
modelado base
modelado base
modelado base
rebase con master
fix conflict
Merge remote-tracking branch 'upstream/master' into api
Agregado TastyPie a requerimientos
Resuelto conflicto con requirements.txt (requests iba a versión 1.1.0 cuando estaba en 2.x)
Ajustes de legibilidad en README.md (cambios de markdown)
- Minor tweaks.
Merge pull request #10 from joelalejandro/master

Ajustes de legibilidad en README.md (cambios de markdown)
Merge pull request #1 from nessita/models

- Minor tweaks.
Merge pull request #8 from mgaitan/models

modelado base
Merge remote-tracking branch 'mgaitan/models' into models

Conflicts:
	escrutiniosocial/escrutiniosocial/settings.py
	requirements.txt
Merge remote-tracking branch 'upstream/master' into models
Merge remote-tracking branch 'upstream/master' into api

Conflicts:
	escrutiniosocial/escrutiniosocial/settings.py
	requirements.txt
Merge remote-tracking branch 'origin/api' into models

Conflicts:
	escrutiniosocial/escrutiniosocial/settings.py
	requirements.txt
API v1, vinculada a todos los modelos existentes