envio de datos para Editar Ciudadano 0.1
Merge branch 'master' of github.com:jhoelcq/lu

Conflicts:
	drtc.db
	drtc/urls.pyc
	examen/admin.pyc
	examen/models.pyc
	examen/views.py
	examen/views.pyc