// test merging the same time
Merge branch 'master' of https://github.com/gowithme/testStockWatcher.git

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