changed pumpkin size from integer to string
Merge remote-tracking branch 'upstream/master'

Conflicts:
	db/schema.rb