restart from scratch
Merge branch 'master' of https://github.com/Macfly/HFTSimulator

Conflicts:
	Simulator.cpp