part3 of django tutorial
Merge branch 'master' of https://github.com/friendm/Django_Test

merge is necessary