added nojekyll file
Merge branch 'gh-pages'
update glossary doc
Merge branch 'gh-pages'

Conflicts:
_assets/glossary.doc
resolved merge conflict