Merge branch 'iteration-2'
Merge branch 'master' into Yung'sBranch
Merge branch 'master' of https://github.com/richseviora/bitmaker-crowdfunder
Merge remote-tracking branch 'origin/mchau' into Yung'sBranch
did some commenting.
schema
Merge branch 'Yung'sBranch' of github.com:richseviora/bitmaker-crowdfunder
Updating to latest version
Merge branch 'master' into applebya
changed the link to select the reward to a button.
Merge remote-tracking branch 'origin/mchau' into Yung'sBranch

Conflicts:
	app/controllers/pledges_controller.rb
	app/views/projects/show.html.erb
conflict fix.
conflict fix
most recent commit while working with Maria and Andrew
Revert "most recent commit while working with Maria and Andrew"

This reverts commit 47b332caf659c68506c0255499d6f60d87d48248.
Revert "Revert "most recent commit while working with Maria and Andrew""

This reverts commit d34cb39de6d8587b8c312daf2ed6b993ba876dd0.
Revert 580fb99..c674738

This rolls back to commit 580fb997b7e496bf89096e67acc22177ffbed80f.
Revert 47b332c..6731901

This rolls back to commit 47b332caf659c68506c0255499d6f60d87d48248.
updated
Merge remote-tracking branch 'origin/mchau' into Yung'sBranch

Conflicts:
	app/assets/javascripts/projects.js
	app/controllers/pledges_controller.rb
	app/controllers/projects_controller.rb
	app/views/pledges/create.js.erb
	app/views/projects/_individual_project.html.erb
	app/views/projects/show.html.erb
	app/views/projects/show.js.erb
conflicts are all resolved.