treshold on stuf
Merge branch 'master' of github.com:freuk/csim

Conflicts:
	swf_analysis/R/analysis.R
comitall