Merge pull request #14 from ajthompson/dev-email

Added email field to user