update setting for merge
Merge branch 'master' of http://github.com/vanhong/stock_analysis