student and teacher model initial commit
editing student, teacher
update teacher, student models
filling out teacher model
update models
update models
update student/teacher models
update student/teacher models
that's it i think?
it compiles at least
models
fix merge error
Merge pull request #10 from calblueprint/john/teacher_student_models

John/teacher student models