test django model
Merge branch 'master' of https://github.com/kaiherng/peacecorps

Conflicts:
	django_model.py