Tango with Django - upto Chap 15
Merge remote-tracking branch 'origin/master'