Glossary: Change Records, Cryptography and PKI

merge conflict

When two branches changed the same lines, Git stops and a person decides the final lines, as with Alex's and Priya's SSH rule edits.