added one enum
refactor
added a comment to field name
asteptam erori
conflicts resolved
Update Student.java
conflicts resolved
conflicts