modified:   src/com/google/gwt/sample/stockwatcher/client/LoginInfo.java
	modified:   src/com/google/gwt/sample/stockwatcher/client/StockPrice.java
Merge branch 'master' of https://github.com/nancywang1991/StockWatcher

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

	modified:   war/WEB-INF/classes/com/google/gwt/sample/stockwatcher/client/StockPrice.class