Merge branch 'main' into 'brodybranch'

myproject/myapp/static/src/images/0_IPKn3dedq86U4UqP.png

myproject/myapp/static/src/output.css

myproject/myapp/templates/index.html

myproject/myapp/templates/user_page.html

myproject/myproject/settings.py