try merge conflict
make a little change to README
make a little change to StockWatcher.css