migration and associations added to models
trying different tests for associations
Merge branch 'master' of https://github.com/juandefelix/rails_makeup_scheduler into cancellations
added a flash message in cancellation_controller
tested created cancellations
Associations implemented. Tests for User.created_cancellations