Changed variables Merged functions together
Changed variables
Merged functions together

SergiuTripon/bsc-dissertation-student-portal,SergiuTripon/bsc-dissertation-student-portal,SergiuTripon/bsc-dissertation-student-portal