Created Django website
Merge branch 'master' into publish