Merge pull request #50 from jgromeros/dev

Dev
Email sending code commented out waiting to be finished