new dotfiles
Merge branch 'master' of github.com:patyoon/dotfiles

Conflicts:
	.gitconfig
	.zsh_aliases
	.zshrc
	patyoon.el