Delete .DS_Store
modifications
Merge branch 'C3_S17_As_a_child_I_can_show_an_event_page' of https://github.com/yousraHazem/Topsoft-14 into C3_S17_As_a_child_I_can_show_an_event_page
changin in doc
remove media files
Update profile_musics_controller.rb
Merge pull request #182 from yousraHazem/C3_S17_As_a_child_I_can_show_an_event_page

C3 s17 as a child i can show an event page
resolve conflict with development