fixing the mess from git
Merge branch 'master' of https://github.com/tangohead/SmokeSNET-Main

Conflicts:
	Repast.settings
	out.txt
	velocity.log