-
Merge branch 'master' of github.com:maxgronlund/digiramp
mail campaigns
Merge branch '-master' of github.com:maxgronlund/digiramp

Conflicts:
	db/schema.rb