update title
commit
Manual merge of index file

Chose title from master
updated word glossary file
updated word glossary file
Merge branch 'gh-pages'

Conflicts:
	_assets/glossary.doc