some changes
correct miss spelling
Merge branch 'master' of github.com:hage/dot-files

Conflicts:
	dot.tmux.conf