Added Pledges
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
	app/controllers/pledges_controller.rb
	app/views/projects/show.html.erb
The Mother of all Merges