In Stockwatcher.java, lastUpdatedLabel.setText added new string
"Conflict Here Time: UTC"


Secondary
MORE CHANGES
Merge branch 'master' of https://github.com/whitecaps/CPSC310Lab2Part4 into ken
Merge branch 'kevin'

Conflicts:
	src/com/google/gwt/sample/stockwatcher/client/StockWatcher.java
Merge branch 'ken'

Conflicts:
	src/com/google/gwt/sample/stockwatcher/client/StockWatcher.java