tmux conf added
merge problem because of submodules