my django app
Merge branch 'master' of https://github.com/yilunzh/my_django_app

Conflicts:
	.gitignore