# Conflicts:
#	ActualProjectCode/DjangoProject/templates/modelForms/deleteRecord.html
#	ActualProjectCode/DjangoProject/templates/profile.html

# Conflicts:
#	ActualProjectCode/DjangoProject/core/migrations/0001_initial.py

admin screen "finished" mostly, can update user roles and delete with an error, idk how to fix ill fix it later.

admin screen "finished" mostly, can update user roles and delete with an error, idk how to fix ill fix it later.

1) added more database stuff (mlModel, Billings, Interactions, Records). 2) New Directory (mlModels) for storage of mlModels in the future. 3) Addeds separate dashboard htmls in new directory (templates/dashboards) in hopes of getting modelforms to work in the future.

1) added more database stuff (mlModel, Billings, Interactions, Records). 2) New Directory (mlModels) for storage of mlModels in the future. 3) Addeds separate dashboard htmls in new directory (templates/dashboards) in hopes of getting modelforms to work in the future.

# Conflicts:
#	.idea/misc.xml
#	.idea/modules.xml