Initial hacked together working copy
Merge branch 'master' of https://github.com/kaycal/StarDjango