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
Adding perks dinamically
Fixing some bugs
Fixed nested form for campaigns and perks
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
Fishing heroku config
Working with some gem versions
Merged ui
Merge branch 'master' of github.com:ITBA/donar
Fixes null
Style fixes
Revert "Fixes null"

This reverts commit cf28753ab4b9a3c7e530061c24111da2cdf208e4.
Revert "Merge branch 'master' of github.com:ITBA/donar"

This reverts commit f053d57fd6a90c97d8c37b6def663dc4595d2bf6, reversing
changes made to cd50f1a285e0f63439f7ea7e3899aaf99831dcb7.
Revert "Merged ui"

This reverts commit 87d7710d00a252f024d089cd6c36764158ae31d7.

Conflicts:
	app/assets/stylesheets/util.css.scss
	app/views/application/funder.html.slim
	app/views/campaigns/show.html.slim
	app/views/layouts/_funder_login_navbar.html.slim
Merge branch 'master' of https://github.com/ITBA/donar into search