added nojekyll and updated index
Merge branch 'gh-pages'
added title attribute
updated link, added title
manual merge

 chose title attribute from the GH pages branch
Updated word glossary file
updated word glossary file
Merge branch 'gh-pages'

Conflicts:
	index.html