stugg
merge stuff
Merge branch 'master' into jake
working modal for email submit