made a notificatoin model
fixed merge conflicts
added friendship find friends method
made friendship functions
Merge branch 'master' of https://github.com/ldikeou/project_odds_are