fixing some rubocop errors and fixed mailer for cancelled appointment
fixing more errors
fixing merge conflicts
Merge pull request #47 from jereln/jerel-final-edits

Jerel final edits