Changed indent, parameters input and logfile
Merge branch 'master' of github.com:paulstaab/scrm into pruning

Conflicts:
	src/scrm.cc