tvturk: Quantitative fit to exp 1
Merge branch 'master' of github.com:johnmcdonnell/rationalHaskell

Conflicts:
	fit_glc.R
Quantifying bimodality effect.
Merge branch 'master' of github.com:johnmcdonnell/rationalHaskell

Conflicts:
	fit_glc.R