Changed max price change and added in a conflict (hopefully)
Changed max price change and added in a conflict (hopefully)
Conflict resolved
Added a conflict in StockWatcher.refreshWatchList()
Merge branch 'master' of https://github.com/cdyck/310lab2