create conflict
Merge branch 'master' of https://github.com/htq320/310lab2test

Conflicts:
	war/StockWatcher.css