Set up Students and Instructor models
Merge conflicts