i hope i didn't break anything
what the hey
un gitted txt
removed file_list
fixed merge conflicts with models.py
up till now have stuff working
fixed merge conflicts