added email
Merge branch 'master' of https://github.com/djq/djq.github.com