a
qMerge branch 'master' of github.com:chenhh/MCSTradingRule

Conflicts:
	src/MCSTradingRule/test.py
ohlcsma