Updated to django server
Merge branch 'master' of https://github.com/jkr241/team_don
Removed old code