Result after running
Merge branch 'master' of https://github.com/thomafred/xingyi_tom

Conflicts:
	PullFromYahoo/STO.txt