rm'd conflicting routes
Jorge's edit of routes.rb approved

Conflicts:
	config/routes.rb
added pledge list to campaigns#show
Merge branch 'master' of https://github.com/jorgeolivero/crowdtilt