attempt to revert
Merge branch 'master' of https://github.com/assaultarmor/Django_Frontend

Merge local with remote