gpg
Merge branch 'master' of https://github.com/napcae/dotfiles

Conflicts:
	link/.gnupg/pubring.gpg
	link/.gnupg/pubring.gpg~
	link/.gnupg/trustdb.gpg