fixed untracked files
Revert "fixed untracked files"

This reverts commit b0420cf59c48ceb91c60ef4bdfbc442344a66507.
NF: fix .env in repo issue
BF: Massive fuckery to get pycharm to pick up environment variables stored in .env (doesn't support this natively yet).
Attribute source of hack
NF: Installed Django-shop instead of Carton
Merge branch 'develop'