playing with views and templates
Merge branch 'master' of https://github.com/cljohnson/django