added play@upload
Merge branch 'c4_s24_implement_music_recording_code' of https://github.com/yousraHazem/Topsoft-14 into c4_s24_implement_music_play_upload
music_play_and_upload
Meriging development to avoid conflicts
Merge branch 'development' of https://github.com/yousraHazem/Topsoft-14 into C4_S7_S8_create_join_chatroom
applying comments
pulling development to fix conflicts Merge branch 'development' of https://github.com/yousraHazem/Topsoft-14 into C4_S7_S8_create_join_chatroom
#297 #298 applying comments
#297 #298 applying comments
fixing conflicts Merge branch 'development' of https://github.com/yousraHazem/Topsoft-14 into C4_S7_S8_create_join_chatroom
297 #298 fixing conflicts
#297 #298 applying comments
apllying comments
fixing conflicts
Merge pull request #396 from yousraHazem/C4_S7_S8_create_join_chatroom

7- 8- As a child, I can create / join chatroom
code_rev
fixed
Merge pull request #411 from yousraHazem/c4_s24_implement_music_play_upload

24 - implement music play and upload
fixed confilcts in routes