Update StockWatcher.java
Merge pull request #1 from slai94/master

Update StockWatcher.java
resolved merge conflict