up master
gh
master
gh
resoved merge conflict
Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	_assets/glossary.doc