asd
Merge branch 'master' of https://github.com/matbravo/presidenciables

Conflicts:
	PP/PP/__init__.pyc
	PP/PP/settings.pyc
	PP/PP/urls.pyc
	PP/PP/wsgi.pyc
	PP/Promesas/__init__.pyc
	PP/Promesas/models.pyc
	PP/Promesas/urls.pyc
	PP/Promesas/views.pyc
agregado wsgi.py