Merge Conflict resolved.

.gitignore

README.md

authentication/urls.py

booking/forms.py

booking/templates/make_booking.html

booking/views.py

cinema/templates/cinema/film_showings.html

cinema/templates/cinema/films_management.html

cinema/templates/cinema/showings_management.html

cinema/templates/cinema/user_management.html

clubs/templates/clubs/manage_clubs.html

database/Dockerfile

docker-compose.yml

requirements.txt

stripe-service/Dockerfile

stripe-service/db.sqlite3

stripe-service/manage.py

stripe-service/requirements.txt

stripe-service/stripePayments/__init__.py

stripe-service/stripePayments/admin.py