changed same line
Merge branch 'master' of https://github.com/AdamMarkus/Stockwatcher

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