Added pledges controller
Resolved conflicts in routes
Last point in iteration 1 complete. HTML only.
Merge remote-tracking branch 'origin/mchau' into Yung'sBranch