Updated UML, Setup, and models.py
Resolved models conflict