Updated glossary.doc file
Update glossary.doc file with Readme def
resolved merge conflict