finished django model
Merge branch 'taipei' of github.com:CarolHsu/tutorial into taipei