registro agregado
Merge branch 'master' of https://github.com/CABT/Proyecto-03

Conflicts:
	foro/models.py
	registro/models.py