modified
Merge branch 'master' of https://github.com/ShirleyXu/StockWatcher
Merge branch 'jinsoorhee'
change again
Merge branch 'jinsoorhee' of https://github.com/ShirleyXu/StockWatcher into jinsoorhee
merge the third time