added notification icon to menubar
adding notifications
adding notification system
resolving conflicts
finished notifcations
fixing conflicts
fixing more conflicts