merge conflict
messed up stockwatcher.java hope this works
Merge branch 'mergeconflict1'

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