difference between ellx and ellx2 fixed
Merge branch 'master' of git@github.com:heike/sine-illusion

Conflicts:

	SineIllusion-Rearrange.Rnw