set up everything
merge conflicts
campaign page
make about framework
Merge pull request #2 from calblueprint/Tricia/campaign

campaign page
Merge pull request #1 from calblueprint/blog

added shared files (elizabeth this is for you)
WE DONT CARE
merge conflicts
Merge pull request #3 from calblueprint/warren/make-about

Warren/make about
merge conflicts