master change
conflit on index pages
manual Merge branch 'gh-pages'

Conflicts:
	index.html
Update word gloss
update word in gh pages
resolve bin conflit
Merge branch 'master' of https://github.com/malix213/github-for-web-designers