some minor stuff
Merge branch 'master' of https://github.com/asifzubair/ABC-Net

Conflicts:
	ABCMCMC-Background.cpp