Home GnuPG

Manually merged version conflict (litteral) and features for git integration…