Changed my email address
Merge branch 'master' of https://github.com/josephg/words