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

Conflicts:
	registro/models.py
branch-juan