Merge remote-tracking branch 'refs/remotes/origin/main'

backend/src/app.py

@@ -1,11 +1,15 @@
-from flask import Flask, request, Response, jsonify
+from flask import Flask, Response, jsonify, request
 from flask_cors import CORS
+<<<<<<< HEAD
 import dotenv
 
 from .classes import Room
 # from . import song_fetch
 
 dotenv.load_dotenv()
+=======
+from room import Room
+>>>>>>> refs/remotes/origin/main
 
 app = Flask(__name__)
 CORS(app)