Fondo mejorado
Merge branch 'PetterKunMAC'

Conflicts:
	principal/static/css/takarahunter.css