Added tmux.conf
Merging