notifications updated
Merge pull request #37 from jmr12345/development

notifications updated