please cause conflict
 Please enter the commit message for your changes. Lines starting
fix merge conflicts: Merge branch 'master' of https://github.com/monL/Lab2_Repo

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