role names
Merge branch 'master' of github.com:david-brooks/crowdfunder
Merge branch 'master' of github.com:david-brooks/crowdfunder
Merge branch 'master' of github.com:david-brooks/crowdfunder
fixed bug
change
generated rewards & pledges controller
Merge branch 'master' of github.com:david-brooks/crowdfunder

Conflicts:
	app/controllers/rewards_controller.rb
	app/views/rewards/new.html.erb
edited styling