add south
Subo archivo de importación de csv a lista de diccionarios
- Minimal integration of django-allauth: initial support for github login.
- Added dummy home landing page.
Merge pull request #5 from fbobbio/csv-import

Subo archivo de importación de csv a lista de diccionarios
Merge pull request #4 from mgaitan/models

add south
- Integrated django-allauth.
Merge remote-tracking branch 'upstream/master' into add-allauth.

Conflicts:
	escrutiniosocial/escrutiniosocial/settings.py
Merge pull request #6 from nessita/add-allauth

- Initial integration of django-allauth: support for github login.
Merge remote-tracking branch 'upstream/master' into develop
merge
Conflicts:
	escrutiniosocial/escrutiniosocial/settings.py
where are we