added ctrlp
fixed merge conflict
added tmux windows into my workflow