Merge pull request #1 from nataliapitts/master

General_Timeliner, Glossary