basic contact form
Merge pull request #23 from tdoshi/contactForm

basic contact form
fix merge conflict