hi
Merge branch 'master' of https://github.com/obihann/dotfiles

* 'master' of https://github.com/obihann/dotfiles:
  updates

Conflicts:
	home/.irssi/scripts
	home/.tmux.conf
	home/.zlogin