User Study corrections
Resolved changes

Merge branch 'master' of github.com:heike/sine-illusion

Conflicts:
	SineIllusion-Rearrange.Rnw