i
Merge branch 'master' of https://github.com/xmduhan/fx

Conflicts:
	Scalping.mq4
iMerge branch 'master' of https://github.com/xmduhan/fx

Conflicts:
	Scalping.mq4
i