2.3

email form linked to haley's email
Merge pull request #12 from TopherJonesy/master

2.3