initial commit
Merge branch 'master' of github.com:teamaker/dotfiles

Conflicts:
	.Xdefaults
	.i3/config
	.xinitrc
	.zshrc