Merge branch 'JE_BranchV4' into FA_BranchV4
Working on the Audio Player
Merge Conflict Resolved

Conflicts:

LectuREC/app/src/main/java/com/example/team05/lecturec/ViewControllers/A
udioFragment.java