Merge branch 'master' of https://github.com/Wouther/DominSim

Conflicts:
	main.cpp
Merge branch 'master' of https://github.com/Wouther/DominSim