add title 1 on gh-pages
add title 2 on master
Merge branch 'gh-pages'

Conflicts:
	index.html
edit glossary
update glossary on gh-pages
fix merge conflicts for binasry file