Working on notificationt (cont)
Merge remote-tracking branch 'origin/master'