Merge branch 'JE_BranchV4_ModSess' into JE_BranchV4
Merge branch 'JE_BranchV4_ModSess' into JE_BranchV4
Merge branch 'JE_BranchV4_ModSess' into PG_BranchV4
DataManager Work 1
new branch sync
DataManager Work 2

All Audio and Images Done (I think)
Merge branch 'JE_BranchV4_ModSess' into JE_BranchV4
Merge branch 'PG_BranchV4' into JE_BranchV4_ModSess
DataManager Work 3

All Completed (I Think!!!!! PLS YES :( )
Merge branch 'JE_BranchV4_ModSess' into JE_BranchV4
EditModule Work 1
EditModule Work 2
Mrg 'FA_BranchV4' into JE_Branch_EditModule

Conflicts:

LectuREC/app/src/main/java/com/example/team05/lecturec/ViewControllers/M
ainActivity.java
Merge branch 'JE_Branch_EditModule' into FA_BranchV4