merging changes
commit before merge
commit after merge
Added functionality to get student notifications