初始提交
Merge branch 'master' of https://github.com/812lcl/dotfiles

Conflicts:
	.aliases
	.exports
	.gitconfig
	.i3