establish about css
automatic sizing
start team
border shadows
basic campaign layout
Merge branch 'master' into warren-about-page
add section links
buttons and simple fixes
small fixes
Merge branch 'master' into warren-about-page
changing for amazon s3
Merge branch 'master' into tricia/campaign

Conflicts:
	.DS_Store
	app/.DS_Store
general button
Merge pull request #11 from calblueprint/warren-about-page

establish about css
hellllla swag
Merge pull request #12 from calblueprint/Tricia/campaign

tricia/campaign
add da button
delete stuff
Merge pull request #13 from calblueprint/tricia-campaign

tricia-campaign good job on the branch name!
wtf
Delete .DS_Store