Lo que he hecho yo
Merge branch 'master' of https://github.com/kalvinmanson/hicking
Merge branch 'master' of https://github.com/kalvinmanson/hicking