merge conflict
Merge branch 'jinsoorhee' of https://github.com/ShirleyXu/StockWatcher into jinsoorhee
merge again
Merge branch 'master' of https://github.com/ShirleyXu/StockWatcher