changesl
merge
added tmux config