first commit
setting
Merge branch 'master' of https://github.com/chenhh/DjangoStockData.git

Conflicts:
	.gitignore