Merge pull request #3 from SeGonzalezR/dev

Dev
Cambios varios!!!!
Merge branch 'master' of ssh://who.gonzalezr.cl/home/armagedon/www/tor into dev
Cambios