new url and database usage included
Merge branch 'djangobranch' of http://github.com/CharlieFaceButt/lesson-kill into djangobranch