adding columns to freindships and notifications
adding poll answer and question
new branch
Issue #139, View Calendar
Issue #139 , Adding Documentation
Issue #139 , Adding another documentation
Merge branch 'migrations' of https://github.com/yousraHazem/Topsoft-14 into C3_S1_View_Calendar

pulling migrations
fixing code issues
another code issue
fixing
Delete children_controller.rb
Delete registered_users_controller.rb
Delete child.rb
Delete registered_user.rb
still fixing
fixing conflicts
fixing conflicts again
fixing bugsss
Merge pull request #188 from yousraHazem/C3_S1_View_Calendar

C3 s1 view calendar