RESET to f429ff56e039776a70a5bb324241df2f5102d45b
Merge branch 'master' of https://github.com/leoxlin/.dotfiles