Cleaned up students and sponsors models
Fixed merge conflict in student model