Edits / corrections og 11_glossary.md
resolved editing conflicts in 11_glossary.md