Templates and views
Decoupling routing
Merge branch 'master' of github.com:jaleszek/djangofun