update bootstrap
test
Merge branch 'master' of https://github.com/vanhong/stock_analysis

Conflicts:
	chip/models.py
	stock_analysis/views.py