Added email capability
Merge branch 'master' of github.com:tracymu/wombat-sale