email reset
add new coomits from barry & sharon
merge branch 'master' into venkman
Merge pull request #32 from blind-squirrel/venkman

Venkman