tmux configuration file
Merge branch 'master' of https://github.com/binaryjson/Shell

Sample Merge Message