current changes for local machine
Merge branch 'master' into cur

* master:
  vim textwidth added
  cleaning
  merge conflict
tmux conf so i could use the mouse
Merge branch 'cur'

* cur:
  tmux conf so i could use the mouse
  current changes for local machine