changed file
Merge branch 'master' of http://github.com/r0e/StockWatcher

Conflicts:
	testingfile.txt