Fix merge conflict in app/models/mentor
Merge pull request #2 from allareri/mentor_appointments_relationship

Add appointments migration and mentorship