test pc
pc2
Merge branch 'master' of https://github.com/jp052/test1.git

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