working and "pulling"
Merge branch 'master' of github.com:jesusnoseq/TakaraHunter into ramajesusliana
Merge branch 'master' of github.com:jesusnoseq/TakaraHunter into ramajesusliana
toqueteando el fondo
Merge branch 'master' of github.com:jesusnoseq/TakaraHunter into ramajesusliana
arreglado el js
Merge branch 'PetterKunMAC'

Conflicts:
	principal/static/css/takarahunter.css
fondo