Merge branch 'master' of github.com:unRob/informacion-publica

* 'master' of github.com:unRob/informacion-publica:
  puto wiki puto
ya no se hacer links :/