ajustes
Merge branch 'master' of https://github.com/cyz/cyz.github.com