Updated word glossary file
resolve merge conflict
Merge branch 'master' of https://github.com/edwinchen85/github-for-web-designers