fix merge conflicts#7

Open

codybonez wants to merge 9 commits intoCCAppDevs:mainfrom

Commits on Oct 20, 2025

Added Movie controller
cody norwood
committed

Commits on Nov 12, 2025

Fixed merge conflict in mutliple files.
cody norwood
committed
Merge branch 'CCAppDevs:main' into main
codybonez
authored

Commits on Dec 1, 2025

Commits on Dec 2, 2025

Merge branch 'main' into main
codybonez
authored
Finalized Project, added image url photo
cody norwood
committed