buttons and stuff
merge conflicts which I think I did correctly
survey page
fix conflicts
Merge pull request #88 from calblueprint/ethan/headers

Ethan/headers