bash
Merge branch 'master' of github.com:tlamer/.dotfiles