Merged branches
Began Django server.
Name changes.
Slight refactor, added authentication.
Merge branch 'master' into alternate