added basic notification system
Merge branch 'KyleR'
Fixed merge conflicts