Module Activity Work 2
Merge branch 'JE_BranchV4' into FA_BranchV4
Module Session Work 1
Working on the Audio Player
Image and Audio Work
Merge branch 'JE_BranchV4_ModuleSessions' into JE_BranchV4
Merge Conflict Resolved

Conflicts:

LectuREC/app/src/main/java/com/example/team05/lecturec/ViewControllers/A
udioFragment.java
Audio Fragment Merge 1 completed
Merge branch 'JE_BranchV4_ModuleSessions' into JE_BranchV4
Alarm Service
Merge branch 'JE_BranchV4_ModuleSessions' into FA_BranchV4
Imgs Display Working. First NewSession Displaying.
Audio fragment Updated
Audio player finally working
Module Session Work 1

Main work completed

Folder stuff needed
Merge branch 'JE_BranchV4_ModSess' into JE_BranchV4
Working on the selected session layout
Merge branch 'FA_BranchV4' into JE_BranchV4_ModSess
Merge branch 'JE_BranchV4_ModSess' into JE_BranchV4
Merge branch 'JE_BranchV4'