adding things (;
Merge branch 'master' of github.com:pxlpnk/dotfiles

Conflicts:
	tmux.conf
	zshrc.local