Merge branch 'JE_Branch' into FA_Branch
Deleted something
Merge branch 'JE_Branch' into FA_Branch
Merge branch 'JE_Branch' into FA_Branch
Merge branch 'FA_Branch' into FA_Branch_FragmentTesting
Merge branch 'JE_Branch' into FA_Branch
Merge branch 'JE_Branch' into FA_Branch
Merge branch 'FA_Branch' into FA_Branch_FragmentTesting
Module fragment and Archive Fragment populated
Merge branch 'FA_Branch_FragmentTesting' into FA_Branch
Share App intent done
Merge branch 'FA_Branch' of https://github.com/COC155MobileAppDev/MobAppDev into FA_Branch
Mrg brnch 'FA' - Master_COPY2 - Conflict Resolved

Conflicts:
	LectuREC/app/src/main/AndroidManifest.xml
Merge branch 'Master_COPY2'