update glossay (.doc) (in branch gh-pages)
resolved merge conflict in favor of gh-pages