hogw
merge
merge
Merge branch 'master' of https://github.com/taichouchou2/dotfiles

Conflicts:
	.gitconfig