added attr accessors
added to students
fixed conflicts
fixed merge congflicts
fixed student to students
Merge conflicts