modified some stuff
merge conflict
new student