Added 1 date, made Student class
fixed conflict