up to one state fit -> done
Merge branch 'master' of github.com:annube/Chifit

Conflicts:
	R/fit.corr.R
blocking analysis