Rewards inserted
Merge branch 'master' of github.com:AfreenMunshi/CrowdFunding

Conflicts:
	app/views/transactions/show.html.slim
	config/locales/en.yml