working on notifcs
resolve
Merge branch 'master' of github.com:lmccart/fixus