contact page form setup
test
contact page
fixed merge conflict
Merge pull request #20 from colinbrownec/master

contact page and stuff