luluWork branch added
Hi
wrote in hey
fixed conflict
still making a conflict
Merge branch 'master' into cpsc310part4

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