Develop

Merge contains changes to code making it closer to PEP8 standards and also contains static django files for hosting