git stuff
Merge

Merge branch 'master' of github.com:eob/dotfiles