First update main file

hi
update
update 2

this is great update
Merge pull request #1 from Wouther/RudiFirstBranch

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

Conflicts:
	main.cpp