Added more functionality to the notification
Fixed merge conflict for PomodoroFragment