changed even more stuff!
new branch
new branch
changing
Merge remote-tracking branch 'origin/codeEdit1'

Conflicts:
	StockWatcher/src/com/google/gwt/sample/stockwatcher/server/Stock.java
Merge remote-tracking branch 'origin/ZoeNewBranch'

Conflicts:
	StockWatcher/src/com/google/gwt/sample/stockwatcher/server/Stock.java
Merge branch 'ZoeNewBranch' of https://github.com/zathans/StockWatcher
Merge remote-tracking branch 'origin/master'

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