basic campaign layout
Merge branch 'master' into tricia/campaign

Conflicts:
	.DS_Store
	app/.DS_Store
hellllla swag
Merge pull request #12 from calblueprint/Tricia/campaign

tricia/campaign