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