More conflict
Merge branch 'master' of https://github.com/kwivens/CPSC310_lab2a

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