Change EduComp
Merge branch 'master' of https://github.com/irunguh/portal
GG changes
merge conflicts
merge
 Edu comp
merge conflicts
Edu comp
Merge branch 'master' of https://github.com/irunguh/portal
Backend edu comp