Use correct email for users
Merge pull request #56 from cdman/development

Use correct email for users
Merge pull request #57 from udacity/development

Merge development