added cancelled to requests and cancelled email
Merge branch 'master' of https://github.com/meara/brain_trade
Merge pull request #66 from meara/cancellation_emails

Cancellation emails