Nuevvo
muchas cosillas molonas
Merge branch 'TakaraHunterAlf'

Conflicts:
	principal/views.py

cambios
mas
Merge branch 'master' of https://github.com/jesusnoseq/TakaraHunter