change1 e2
Merge branch 'origin/master'

Conflicts:
	StockWatcher/test.txt