campaign type column
validation fix
merge conflict Merge branch 'master' into warren-campaign

Conflicts:
	db/schema.rb
merge conflicts
start adventure scene
preliminary movement
basic campaign adventure prototype
campaign kind enum
campaign type and recent donation
start footer fix
prototype styled footer
finish show so tricia can work on it
merge conflict
Merge pull request #48 from calblueprint/warren-campaign

Warren campaign