introducing conflict
conflicting branch
Merge branch 'newbranch'

Conflicts:
	src/com/google/gwt/sample/stockwatcher/client/StockWatcher.java
	war/WEB-INF/classes/com/google/gwt/sample/stockwatcher/client/StockWatcher$1.class
	war/WEB-INF/classes/com/google/gwt/sample/stockwatcher/client/StockWatcher$2.class
	war/WEB-INF/classes/com/google/gwt/sample/stockwatcher/client/StockWatcher$3.class
	war/WEB-INF/classes/com/google/gwt/sample/stockwatcher/client/StockWatcher$4.class
	war/WEB-INF/classes/com/google/gwt/sample/stockwatcher/client/StockWatcher$5.class
	war/WEB-INF/classes/com/google/gwt/sample/stockwatcher/client/StockWatcher$6.class
	war/WEB-INF/classes/com/google/gwt/sample/stockwatcher/client/StockWatcher$7.class
	war/WEB-INF/classes/com/google/gwt/sample/stockwatcher/client/StockWatcher$8.class
	war/WEB-INF/classes/com/google/gwt/sample/stockwatcher/client/StockWatcher.class