Trying to create a conflict.
commit
Merge branch 'master' of https://github.com/csw244/Stockwatcher.git

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