C4_S0_adding interaction with group
Merge branch 'General_Skeleton_Code_C1S0' of https://github.com/yousraHazem/Topsoft-14 into General_Skeleton_Code_C1S0
We mixed up the child with the signup
"changed"
Edited my sign up with view to be continued in sprint 1 as I need to
merge with child
Added documentation
Added Documentation
Merge pull request #101 from yousraHazem/C2_S6_Signup_Children

C2 s6 signup children
"finall"
Revert ""finall""

This reverts commit c8492dd4aa01b48df3f595ba8cd94af9360bddbc.
Merge branch 'master' of https://github.com/yousraHazem/Topsoft-14 into C4_S0_Leave_and_interact_with_group

Conflicts:
	kidzen/config/initializers/secret_token.rb
	kidzen/config/routes.rb
Added methods to group members controller
Merge pull request #91 from yousraHazem/C4_S0_Leave_and_interact_with_group

merged
Merge pull request #106 from yousraHazem/C4_S0_user_interact_with_group

C4 s0 user interact with group
Merge pull request #108 from yousraHazem/C4_S0_as_a_child/supervisor_provide__i_can_invite_others_to_a_group

C4 s0 as a child/supervisor provide  i can invite others to a group
Final edit
removing conflictsMerge branch 'master' of
https://github.com/yousraHazem/Topsoft-14 into
C4_S0_Leave_and_interact_with_group

Conflicts:
	kidzen/app/controllers/groups_controller.rb
Merge pull request #109 from yousraHazem/C4_S0_Leave_and_interact_with_group

Final edit
"Fixing merge"Merge branch 'development' of https://github.com/yousraHazem/Topsoft-14 into C4_S0_Leave_and_interact_with_group

Conflicts:
	kidzen/Gemfile
	kidzen/Gemfile.lock
	kidzen/app/controllers/child_controller.rb
	kidzen/app/controllers/registered_user_controller.rb
	kidzen/app/models/child.rb
	kidzen/app/models/friend_ship.rb
	kidzen/app/models/notification.rb
	kidzen/app/models/parent_child.rb
	kidzen/app/models/permission.rb
	kidzen/app/models/registered_user.rb
	kidzen/app/models/supervises_child.rb
	kidzen/config/initializers/secret_token.rb
	kidzen/config/routes.rb
	kidzen/db/migrate/20140323203408_rename_column.rb
	kidzen/db/migrate/20140325011722_parent_child_index.rb
	kidzen/db/migrate/20140325011848_friend_ship_index.rb
	kidzen/db/migrate/20140325011952_supervises_child_index.rb
	kidzen/db/schema.rb
	kidzen/test/models/registered_user_test.rb
Merge pull request #113 from yousraHazem/C4_S0_Leave_and_interact_with_group

C4 s0 leave and interact with group