a la mierda 2
Merge branch 'master' of https://github.com/jesusnoseq/TakaraHunter

Conflicts:
	principal/models.py
Lo que sea