making another change
Merge branch 'master' of http://github.com/jtgi/stockwatcher

Conflicts:
	README