Adding merge conflict
Merge branch 'master' of https://github.com/JonJeffery/CPSC310Lab2Merge

Conflicts:
	StockWatcher/src/com/google/gwt/sample/stockwatcher/StockWatcher.gwt.xml