refactoring
fixed x1s, x2s to list of ints
Merge branch 'master' of https://github.com/andreasbock/statml

Conflicts:
	probandparameter.py