merge glossary to master

merging master and glossary can I?