decided getId in stocks only needed too return 1
fixed conflicts
Merge branch 'master' of https://github.com/o1b9/StockWatchers

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