Adding funder
create campaign
Working with funder for campaign creation
Merge branch 'master' into campaign

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/campaigns_controller.rb
	app/models/campaign.rb
	app/views/campaigns/_form.html.slim
	app/views/campaigns/new.html.slim
	app/views/campaigns/show.html.slim
	config/locales/en.active_record.yml
	config/locales/es.active_record.yml
	config/locales/es.yml
	config/routes.rb
Using backend data to fill in index view
Still working with ui
Merge branch 'campaign'

Conflicts:
	Gemfile
	app/assets/javascripts/application.js
	app/views/campaigns/_form.html.slim
	app/views/campaigns/show.html.slim
Merged ui
Merge branch 'master' of github.com:ITBA/donar